merge mikemayer67/master into mikemayer67/mam_hacks