refactor to entry everywhere
Merge branch 'master' into gh-pages
refactor to entry everywhere