Added JavaDoc
Merge pull request #2 from Gijs-W/JavaDoc

Added JavaDoc