Fixing compilation issues on linux
Merge pull request #1281 from konstin/master

Fixing compilation issues on linux