Merge pull request #3 from theoriginalbit/master

3 commits coming your way