I've improved this commit by making it use the appropriate OS path separator and I've rebased it with the current master branch.