fixed generic parameter type
fixed javadoc typo
Merge pull request #132 from pniederw/generics-fix

Generics fix