Merge pull request #1733 from Aikes/master

Fixes file path traversal issue on win platform.