Readme update and bug fix