Added test code, fixed 64bit bugs.
Merge branch 'master' of https://github.com/chris-stones/ShovelOS

fixed comments