Merge pull request #40 from robinshine/dev

Dev