fix issue #117
Merge pull request #120 from kwaledesign/dev

fix issue #117