fix for issue 104
Merge pull request #127 from kwaledesign/dev

fix for issue 104