Merge pull request #121 from WinterMute/64bit_win_fix