merge PRs and fix README