Bug fixes, use unsigned long long instead.
Merge branch 'master' of https://github.com/ChrisAU/Categories