fix for issue 49
Merge pull request #69 from kwaledesign/dev

fix for issue 49