Updated README.md and Fixed bugs