New code (various)
Merge branch 'master' of https://github.com/CommonEconomist/mapping-events