fix OsSocket in win, TODO: check linux
Merge branch 'master' into world