new settings
Merge branch 'master' of https://github.com/toerq/OSM-Project