Task 1 done
Merge branch 'master' of https://github.com/ttsoftware/OSM