Fixed some merge conflicts and directory separator constant usage implementation
Merge remote-tracking branch 'origin/master' into luis