Added 32 and 64 bit support