better demo for tmr
Merge branch 'master' into gh-pages