Merge pull request #1 from skurfer/master

64-bit updates