fix for issue #147
Merge pull request #152 from kwaledesign/dev

fix for issue #147