Merge pull request #389 from notaz/master