Merge pull request #34 from kevmoo/master

More cleanup