Linux paths fixes #7
Merge branch 'develop'