simplifying deploy script
Merge branch 'master' into develop