Merge pull request #1 from cloudfoundry/master

Fix compilation on 32-bit machines