Merge pull request #11 from kevmoo/master

More cleanup