changed names and added map
merge
Merge branch 'master' of github.com:ericlundmark/ESH

* 'master' of github.com:ericlundmark/ESH:
  pers