Updated the paths in the sample configuration.
Merge branch 'master' into updated-configuration