Merge pull request #27 from Karlson2k/Win32x64