fix issue #9
Merge pull request #17 from kwaledesign/dev

fix issue #9