Fix for int not returning longs for int's larger then 32-bits

Fixes #230