Added myself
Merging changes