Cleaning things up!
Resloved README merge conflict