Merge pull request #95 from arjantijms/master

Revert adding generic parameters - doesn't pass signature test