Clean up and polishing
Merge pull request #147 from rmdstudio/master

Clean up and polishing