Merge pull request #5 from jhprinz/master

Cleaning up