Merge pull request #254 from mpeuster/osm/master

Osm/master