Merge pull request #56 from csmith/circle

Add support for building javadoc.
Merge remote-tracking branch 'origin/master' into circle