fix for issue #146
Merge pull request #156 from kwaledesign/dev

fix for issue #146