Merge pull request #228 from QuickJack/3e163743eda89cc8c239779a75dd245be12aee3c