javadoc
Merge pull request #280 from HoltMaki/master

javadoc