Add 64-bit support

Merge the 64-bit support from master into develop