Merge pull request #254 from mpeuster/osm/master