Now adds temp files to list to be cleared when app is closed
Merge remote-tracking branch 'origin/master'