update javadoc
Merge pull request #37 from zcmoore/master

update javadoc