Merge pull request #316 from fdelapena/master

Tests: Get proper directory separator from detected encoding before call...