Merge pull request #485 from bwrsandman/patch-1

msvc 32bit: Fix C4244 warning