Merge branch 'thomas' into 'master'

first map implementation

See merge request !135
2 jobs for master in 9 seconds (queued for 3 seconds)