version and javadoc:fix
Merge branch 'release/0.4.2' into develop