Merge pull request #1 from stevieflow/master

Updated
Merge pull request #2 from stevieflow/gh-pages

Merge pull request #1 from stevieflow/master