Changed code in 2 files and updated README