Merge pull request #8 from kevmoo/master

A bunch of cleanup
0.5.1