Added JavaDocs
Merged
More Merge
Mest merge fixed
Merge pull request #84 from buren/JavaDoc

Java doc