pathinfo issue
Merge branch 'feature/18' into develop
Merge branch 'release/18'