Merge pull request #19 from chanxuehong/dev

Dev
Merge pull request #20 from chanxuehong/dev

no message
Merge pull request #21 from chanxuehong/dev

no message
Merge pull request #22 from chanxuehong/dev

no message
Merge pull request #23 from chanxuehong/dev

no message
Merge pull request #24 from chanxuehong/dev

no message
Merge pull request #25 from chanxuehong/dev

no message
Merge pull request #26 from chanxuehong/dev

no message
Merge pull request #27 from chanxuehong/dev

no message
no message
Merge pull request #28 from chanxuehong/master

no message