Merge pull request #23 from ivanzhaowy/master

Merge
Merge pull request #24 from ivanzhaowy/master

Merge
 release index
Merge pull request #25 from leplay/master

 release index
Bug fixes.