Add missing type contexts
Merge pull request #4 from mietek/master

Add missing type contexts