Merge branch 'feature/map' into develop (fixes #47)