Merge pull request #185 from QuickJack/master