JavaDoc
Merge pull request #168 from rbrueckner93/Nils

JavaDoc