ignore tmp directory
Merge branch 'master' into configuration_in_code