32 and 64 version support added