1111 upload 4

- fixed bug in win32
- should be compatible under win32 / linux