Merge pull request #66 from unix-ninja/master