Merge pull request #35 from kevmoo/master

more cleanup