Javadocs

#1640
Merge branch 'origin/master'