Update README and bug fix