Add additional types
Merge pull request #4 from ivandankiewicz/master

Add additional types