Merge pull request #1 from JosephCarrington/master

Added from master
Merge pull request #2 from JosephCarrington/gh-pages

Merge pull request #1 from JosephCarrington/master