Closes #236
Merge pull request #239 from andygup/refactor_ghpages

v2.1
Merge branch 'master' into gh-pages