Merge branch 'master' into develop
Updated comments
Merge branch 'develop'