fix for issue #11 and #12
Merge pull request #13 from kwaledesign/dev

fix for issue #11 and #12