javadoc updated
Merge pull request #180 from HoltMaki/master

javadoc updated