Merge pull request #234 from notaz/master