Update javadoc
Merge pull request #1 from box/javadoc

Update javadoc