fix for issue #7
Merge pull request #11 from kwaledesign/dev

fix for issue #7