re-implemented TypeAdapter using factory pattern
Merge remote-tracking branch 'upstream/master'
fix namespaces
Merge pull request #42 from rapid2k1/master

Fixes #41 missing use and fixed namespaces