Latest nitro_s files, small updates
Merge branch 'master' of https://github.com/fairfaxdatasystems/FEBSutff