Bug fixed + README updated