- implementing test for DefaultTypeMapperImpl
- adding additional NPE guards
Merge pull request #65 from silkentrance/master

Implementing tests and fixing issues found, see #1