Merge branch 'git-staging'

Need to fix
Merge branch 'master' into develop

Fixing