fix for issue #66
Merge pull request #158 from kwaledesign/dev

fix for issue #66