removed workaround for paiq/blackcoffee#2

.subst() didn't replace parameter names in functions
Merge remote-tracking branch 'origin/master' into gh-pages
built demo