Merge pull request #273 from antonblanchard/wishbone-checking