Improved javadoc
Merge pull request #1513 from pveentjer/javadoc

Improved javadoc