Merge pull request #388 from unix-ninja/master