Types
Merge pull request #1 from senssei/master

Types