Added map.jinja solution more in line with other formulas, This also improves issue #30 and pull request #30
