fix typo and grammer errors
Merge branch 'develop'