Updated README.md
Merged local and master branch