working on maps support
Merge branch 'master' of https://github.com/comodojo/core