Make 64-bit int work with 'long int' and 'int64_t' for 64 bit builds (Issue #64)