Issue #8

Fix issue #8, ensuring the filenames are Windows compatible.