Merge branch 'master' into develop
fixed typos in comments
Merge branch 'master' into develop
fix ASCII check
Merge branch 'develop'