fixing javadoc and increasing thread safety
incrementing to version 1.1
Merge branch 'release-1.1'
Merge branch 'master' into develop
incrementing version to 1.2-SNAPSHOT