Update javadoc.
Merge pull request #431 from square/dimitris/javadoccc

Update javadoc.