Readme update and small bug fix