implements #50
Merge branch 'stable' of github.com:it3s/mootiro-maps into stable