Add OS type inference
Merge branch 'master' into linux