Javadoc fixes
Merge pull request #9 from SilvioMoioli/javadoc_fixes

Javadoc fixes