Merge branch 'master' into develop
removed comments
Merge branch 'release'