Merge pull request #54 from esc/fix_failing_tests_32bit

Fix failing tests on 32 bit