Merge branch 'map-size-field' - closes #19