Adding support for custom types
fixing broken tests due to type index
Merge pull request #21 from mrkrstphr/custom-types

Adding support for custom types