Merge pull request #28 from chanxuehong/master

no message