Using same coding convention
Removing usage of DIRECTORY_SEPARATOR which only should be used when receiving path
Merge remote-tracking branch 'origin/pr/30'