Fixed path to source files.
Merge branch 'develop'