#44: updated javadocs
Merge branch 'master' into version1.0