Changing to build for both 32 and 64 bit architectures