add type annotation
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from sethladd/master

Add type annotation