Merge pull request #64 from kevmoo/master

Misc cleanup