Adding files from master to tapishr
Added tempfile
Merge branch 'master' into tapishr