updated some javadoc
Merge pull request #137 from HoltMaki/master

updated some javadoc