Merge pull request #4 from yeroc/build-javadoc

Build javadoc.
Merge remote branch 'upstream/master' into build-javadoc