fix path resolution on windows
Merge branch 'dev'