Merge pull request #60 from buzztabapp/gh-pages