[FIX] Issue #5
[FIX] Issue #6
Merge pull request #7 from Th3Mouk/master

[FIX] Issue #5 & #6 and useless file deletion