Fix detection of parameterized return types
Merge pull request #53 from gjdev/fixes

Fix detection of parameterized return types