Merge pull request #11 from martintrojer/master

typehints