Use strings for mapping types instead of keywords
Merge pull request #3 from ponzao/master

Use strings for mapping types instead of keywords