Merge pull request #392 from unix-ninja/master