Some minor code/comment/javadoc fixes
Merge pull request #127 from liry/minor

Some minor code/comment/javadoc fixes