Merge branch 'master' into develop
Refactoring
Merge branch 'develop'