Added capability to support boht 32 & 64 bit installation