Fixes several javadoc errors.
Merge pull request #148 from biafra23/master

Fixes javadoc errors.