fix issue #195
Merge pull request #196 from kwaledesign/dev

fix issue #195