Don't define min/max in windows.h, this leads to compilation issues
Merge branch 'dev' into cuda-dynload