Merge pull request #31 from fendor/type-def-req