Merge branch 'NEW-MASTER' into Nima-Ghods
debug checks for flag tests
flag checks
Merge branch 'Greg-Sauce' into Nima-Ghods
small changes
Merge branch 'Nima-Ghods' into NEW-MASTER