Merge pull request #10 from kevmoo/master

A bunch of cleanup