Fixes #208
Merge pull request #211 from wongcc966422/issue208

Fixes #208