Updated README and merge CHANGELOG