issue122
Merge pull request #125 from ted0000/hotfix_issue122

issue122