Fix javadocs

fix invalid javadocs
More javadoc fixes
Even more JavaDoc fixes
Merge pull request #1 from JamoBox/master

Fix JavaDocs comments, close #1