Merge pull request #3 from emmack/map

Map
back to origional map.js format