Removed leftover tmp file
Merge remote-tracking branch 'oti/master'