Javadoc

Closes #2236