Merge pull request #246 from shaofengshi/staging

Staging