Resulting MSVC 32 bit warning fixed as well
Merge pull request #446 from bjoernthiel/master

Resulting MSVC 32 bit warning fixed as well