Updated README and Changelog
Merge branch 'master' into devel