FIX: Fixes for x64 windows
Merge pull request #43 from Eric89GXL/win-fixes

FIX: Fixes for x64 windows