Updated README and setup script.
Merge branch 'master' into development