Making sure that we delete files we try to extract first
Merge branch 'hotfix-1.0.1'