Merge pull request #9 from ybodson/master

Cleanup