Merge pull request #3 from UCL/master

Merge into staging
Merge pull request #5 from UCL/develop

Merge to staging
Merge pull request #7 from UCL/master

Staging->Master
Turn off figure generation