[Bug #1108946] Typing errors fixed
Merge pull request #206 from trett/master

Typing errors fixed