Fix Windows paths error found by Javier Colmeiro
Merge pull request #700 from joshmoore/rebased/develop/windows-paths

Fix Windows paths error found by Javier Colmeiro (rebased onto develop)