Fixing paths
Merge branch 'master' into done
More updates
Merge branch 'master' into done