Improved OS detection
Merge pull request #77 from kpj/1.0-dev

Improved OS detection