fix int types
Merge pull request #12 from mreiferson/ints_12

fix int types and handling