fixed invalid paths
Merge branch 'master' into develop