Bug fix and readme update