Merge pull request #459 from libtom/less-long-long Don't use long long where not necessary, some platforms lack it