Build-deploy upgrade changes
Merge pull request #39 from pmorie/build-deploy

Build-deploy upgrade changes