Use trap to remove temporary files
Merge remote-tracking branch 'ruester-fork/master'