32 bit version uncommented
merge