Fixed absolute paths.
Merge branch 'develop'