fixed some path nonsense
Merge branch 'dev'