merge macfanatic's master