Updated README
Merge branches 'deploy' and 'master' into deploy