commit1
Merge branch 'master' of http://github.com/alperc92/OSM