Fix parsing of generic types
Merge pull request #67 from gabelevi/generics

Fix parsing of generic types