merge branch 'master'
bugfix
jar + javadoc