cleaned up project
Merge branch 'develop'