#149 fix some javadoc and compiler warnings
Merge pull request #160 from lorban/issue-149

 #149 fix some javadoc and compiler warnings