Fix #72 and #73
Merge branch 'master' of https://github.com/nextgis/metro4all