major changes
Merge branch 'master' of https://github.com/Toerq/OSM-Project