Merge pull request #255 from mpeuster/osm/master