Win32/Win64 compatibility
version(Win64)
. Please enter the commit message for your changes. Lines starting
Merge pull request #385 from dnewbie/master

Win32/Win64 compatibility