Update readme and fixed #7