cleanup and minor bugfix
Merge pull request #4 from theoriginalbit/master

cleanup and minor bugfix