S4 changes from DC
Merge branch 'master' of https://github.com/illustris-bh-wisc/Paper