Bug fix and read me update