Merge pull request #546 from QuickJack/master