Remove hard-coded path delimiter
Fix issue with inconsistent windows path delimiters
Merge branch 'develop' into cgkineo/develop