Bug fix and README fix