issue122
issue122
Merge pull request #124 from ted0000/hotfix_issue122

Hotfix issue122