Updated code to properly mirror branch master