javadoc
Merge pull request #175 from HoltMaki/master

javadoc