JavaDoc added
Merge pull request #133 from rbrueckner93/Nils

JavaDoc added