Merge branch 'master' into develop
incrementing to dev version 1.1-SNAPSHOT
adding thread safety and fixing javadocs
incrementing to version 1.1
Merge branch 'release-1.1'