Cleanup
Merge pull request #29 from pgn84/master

Cleanup