javadoc guidelines
Merge pull request #173 from HoltMaki/master

javadoc guidelines