merge NIFTy_4

1 job for addUnits in 4 minutes and 58 seconds