Merge pull request #196 from github/clarify-state