Cleanup
Merge pull request #9 from ww24/develop

Cleanup