Simplify by using local function names where possible.
Merge remote-tracking branch 'origin/master' into gh-pages
built demo