Merge pull request #21 from robinshine/master

merge to dev
Merge pull request #22 from robinshine/dev

Merge pull request #21 from robinshine/master