Fixed makefile to work for 32 and 64 bit architectures