Clean up
Merge pull request #59 from exbuddha/develop

Clean up