Clean up
Merge pull request #150 from rmdstudio/master

Clean up