Merge pull request #257 from NeoRaider/master