Merge pull request #1 from avoscloud/master

Merge mainstream