javadoc getting even better
Merge origin/master