Merge pull request #13 from selsky/master

Tweak types