new branch
Merge branch 'master' into gh-pages
pre-loaded layers (better performance)