removed a temporary file
fix
Merge remote-tracking branch 'origin/master' into Niklas