Merge pull request #35 from robinshine/dev

Dev
e
Merge pull request #36 from robinshine/master

e