Fixed: Work for 64-bit (refs #3514)
Merge pull request #58 from thingthing/1.4-I3514

Fixed: Work for 64-bit (refs #3514)