Finally fixed linux building
Merge branch 'master' of https://github.com/CraftStone/CraftStone