CP-6958 - Fix 64 bit build
Merge pull request #5 from freddy77/64bit

CP-6958 - Fix 64 bit build