Ported to linux
Merge branch 'feature-linux' into develop
Windows port