Make sure the id is safe before setting the filename as id
Merge branch 'original'
Merge pull request #5 from starzel/master

Make sure the id is safe before setting the filename as id