Bug fixed and README updated