Merge pull request #308 from mkarg/master

JavaDoc typos