Updated to work with 3.7 and 64 bit ruby