Merge pull request #21 from robinshine/master

merge to dev