Merge pull request #14 from kevmoo/master

A bunch of cleanup and fixes