Replace File.separator with Path.SEPARATOR
replaced hardcoded / with path.separator
Merge branch 'tweise-release-1.0.4' into release-1.0.4