fix issue #173
Merge pull request #175 from kwaledesign/dev

fix issue #173