Added some javadoc
Merge pull request #62 from LukasGalliker/master

Added some javadoc