javadoc guidelines
Merge pull request #176 from HoltMaki/master

javadoc guidelines