fix issue #197
Merge pull request #199 from kwaledesign/dev

fix issue #197