Merge pull request #8 from tylerphillips/gh-pages

merge master ... gh
Merge pull request #9 from tylerphillips/master

Merge pull request #8 from tylerphillips/gh-pages   merge master ... gh