Merge pull request #76 from antono/master

Be more clever about OS...