Fix hyphen in README
Update release date in CHANGES
Fix merge conflict from mster