Updated some files from Master