Javadocs. #801
Merge branch 'origin/master'