fix for issue 31
Merge pull request #70 from kwaledesign/dev

fix for issue 31