Merge pull request #28 from chanxuehong/master

no message
Merge pull request #29 from chanxuehong/dev

Merge pull request #28 from chanxuehong/master