Merge branch 'master' into develop
The New Beginning
Merge branch 'develop'