Merge pull request #217 from QuickJack/master