Merge pull request #523 from Sleaker/master

Javadoc fixes