Cleanup
Merge pull request #101 from dereuromark/develop-cleanup

Develop cleanup