Add some more types (#3)
Merge pull request #5 from clehner/master

Add some more types