javadoc guidelines
Merge pull request #171 from HoltMaki/master

javadoc guidelines