Merge branch 'develop'
Update description.
Merge branch 'master' into develop