Updated build script
Merge branch 'master' into deploy