Merging in additional files from master