Adding diff lines
Merging changes from Github