Reformatted code width and added NII/NII_GZ flexibility
Merge remote-tracking branch 'origin/master'