improve JavaDoc
Merge branch 'master' into maven