fix issue #9 and #10, and update CHANGELOG.md
fix issue #12
Merge pull request #14 from kwaledesign/dev

fix issue #9, #10 and #12