Make sure the filename is cleaned here as well.
Merge pull request #27 from paul999/ticket/24

Make sure the filename is cleaned here as well.