Merge branch 'master' of https://github.com/stakisko/elmap.js
Merge branch 'master' of https://github.com/stakisko/elmap.js