Merge branch 'libmap' into goals