Check for deploy not .deploy.
Add error message when can't deploy.
Merge branches 'master' and 'develop'