Merge pull request #253 from ScottLogic/gh-pages-dev

Merge gh-pages-dev into gh-pages for version 1.2.0 release