more javadoc guidelines
Merge pull request #174 from HoltMaki/master

more javadoc guidelines