Fixed type mapping
Merge pull request #6 from 1on/master

Fixed type mapping