Added automatic deletion of *.blah files
Merge remote-tracking branch 'upstream/master'