Clean Up
Merge pull request #61 from exbuddha/develop

Clean Up