fix for issue #149
Merge pull request #157 from kwaledesign/dev

fix for issue #149