Clean fork and edits
Merge pull request #7 from hbogner/master

Edits on a clean fork