Fix havege use of IN on windows
Windows quick-n-dirty port
Merge dev to master
Merge dev
Merge
Cleanup