Updated README and UPGRADE
Merge branch 'develop'