BugFix and Update readme