Merge pull request #600 from tr8dr/master