Re-enable code dependant on reified generics
Merge pull request #223 from unratito/patch-2

Re-enable code dependant on reified generics