Merge pull request #48 from robinshine/dev

Dev
m1
d1
d2