Merge pull request #130 from twogee/correct-javadoc

Correct javadoc