pulling from master
working on maps.js