fixed map pointer
removed extra layer, temporarily
Merge branch 'master' into gh-pages