fix for issue #8 and #9
Merge pull request #10 from kwaledesign/dev

fix for issue #8 and #9