Further work on map
Merge branch 'dev' of github.com:edwindj/smp into dev