Bug fix and README