mini merge permutation
Merge branch 'master' of https://github.com/PhillyQc/GLO-3100