added a fonction to remove temp files
some minor corrections
Merge remote-tracking branch 'upstream/master' into cleanupfunction
corrected whitespaces
Merge pull request #138 from voisardf/cleanupfunction

Cleanupfunction
Fix conflicts