fix for issue #94
Merge pull request #95 from kwaledesign/dev

fix for issue #94