Javadoc

#1345
Merge branch 'origin/master'