update javadoc
Merge pull request #217 from HoltMaki/master

update javadoc