MSVC 64 bit warnings fixed
Merge pull request #445 from bjoernthiel/master

MSVC 64 bit warnings fixed