Pull in Toufics work from the right branch

Pulled `master` instead of `gh-pages` last time.