check for path existence first
Merge branch 'dev'