fix issue #112
Merge pull request #122 from kwaledesign/dev

fix issue #112