Merge pull request #3 from iamcooc/change_content

!
Merge branch 'change_content' into develop
Merge pull request #6 from iamcooc/develop

Develop