Error catching (probably)
Merge pull request #1 from revdancatt/gh-pages

Yup