Bug fix and readme improvement