Merge pull request #282 from Strech/master