Fixed path and dependency issues
Merge branch 'dev'