Merge pull request #7 from kevmoo/master

Some more cleanup