Merging my work branch into the public branch