Added typehints
Merge pull request #615 from bmelman/master

Added typehints