Resolve paths correctly
Merge branch 'develop'