update README and merge existing changelog