Merge pull request #1 from yuhongjie/beta

Merge pull request #1 from liugu/beta