bugfix linux
Merge branch 'master' of https://github.com/mr678/conair.git