cleanup
incrementing to version 1.0
Merge branch 'master' into develop
incrementing to verision 1.1-SNAPSHOT