Windows nifty

Merged Philipp Arras requested to merge windows_nifty into NIFTy_7

Merge request reports