pass locations as data to map
Merge branch 'master' of https://github.com/xprimus/eden