Added fix for resolving generic types

Addresses issue #69