fix for issue 46
Merge pull request #61 from kwaledesign/dev

fix for issue 46