Improve linux support
Improve linux support 2
Merge pull request #1 from VladRassokhin/improve-linux-support

Improve linux support