fix some 64-bit types
Merge pull request #159 from tedu/master

fix some 64-bit types