Merged latest PRs

I merged the latest PRs, updated the readme, and added myself as a contributor to the package.json.