Update README.md

Added fixes for bug 1
Merge branch 'master' into bugfix1