Update README.md

Checked new and old versions of readme to ensure the correct one is merged with the master branch
Fixes #1 and #2