test
delting window-map
test
Merge branch 'master' into gh-pages