win32 adjustments
Merge branch 'master' of https://github.com/zussel/oos
Merge branch 'master' of https://github.com/zussel/oos
Merge branch 'master' of https://github.com/zussel/oos
win32 changes
Merge branch 'master' of https://github.com/zussel/oos