fix for issue #65
Merge pull request #68 from kwaledesign/dev

fix for issue #65