Javadoc
Merge pull request #263 from HoltMaki/master

Javadoc