Merge pull request #996 from slovdahl/master

Typo in javadoc fixed