Merge pull request #151 from iain-benson/feature-64bit-support
Merge remote-tracking branch 'upstream/master'