Merge pull request #25 from robinshine/master

Merge pull request #24 from robinshine/dev
Merge pull request #26 from robinshine/dev

Merge pull request #25 from robinshine/master