Lots of changes
Merge branch 'master' of github.com:inzpektor/mercator