Working on linux, minor path updates
Merge branch 'master' of https://github.com/mr-sk/Arverne