Pull toufic work

Pulled in @TouficS's `gh-pages` branch this time, and cleaned up the code