Merge pull request #221 from github/guides