Improved deploy script.
Merge branch 'develop'