Merge: regen csrc for Windows and to fix 32 bits support