Final version for deployment
Merge branch 'master' of https://github.com/kgary/aspiradeploy