diff --git a/.all-contributorsrc b/.all-contributorsrc
index 1c181443..97eaa492 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -370,6 +370,15 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "jpavon",
+      "name": "Julio Pavón",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/1493505?v=4",
+      "profile": "http://jpavon.com",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index b5f0641f..4ce37165 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 [![version][version-badge]][package] [![downloads][downloads-badge]][npmtrends]
 [![MIT License][license-badge]][license]
 
-[![All Contributors](https://img.shields.io/badge/all_contributors-37-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-38-orange.svg?style=flat-square)](#contributors)
 [![PRs Welcome][prs-badge]][prs] [![Code of Conduct][coc-badge]][coc]
 [![Join the community on Spectrum][spectrum-badge]][spectrum]
 
@@ -959,7 +959,7 @@ Thanks goes to these people ([emoji key][emojis]):
 | [<img src="https://avatars1.githubusercontent.com/u/29602306?v=4" width="100px;"/><br /><sub><b>Michal Baranowski</b></sub>](https://twitter.com/baranovskim)<br />[📝](#blog-mbaranovski "Blogposts") [✅](#tutorial-mbaranovski "Tutorials") | [<img src="https://avatars3.githubusercontent.com/u/13985684?v=4" width="100px;"/><br /><sub><b>Arthur Puthin</b></sub>](https://github.com/aputhin)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=aputhin "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/21194045?v=4" width="100px;"/><br /><sub><b>Thomas Chia</b></sub>](https://github.com/thchia)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=thchia "Code") [📖](https://github.com/kentcdodds/react-testing-library/commits?author=thchia "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/20430611?v=4" width="100px;"/><br /><sub><b>Thiago Galvani</b></sub>](http://ilegra.com/)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=thiagopaiva99 "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/19828824?v=4" width="100px;"/><br /><sub><b>Christian</b></sub>](http://Chriswcs.github.io)<br />[⚠️](https://github.com/kentcdodds/react-testing-library/commits?author=ChrisWcs "Tests") | [<img src="https://avatars3.githubusercontent.com/u/1571667?v=4" width="100px;"/><br /><sub><b>Alex Krolick</b></sub>](https://alexkrolick.com)<br />[💬](#question-alexkrolick "Answering Questions") [📖](https://github.com/kentcdodds/react-testing-library/commits?author=alexkrolick "Documentation") [💡](#example-alexkrolick "Examples") [🤔](#ideas-alexkrolick "Ideas, Planning, & Feedback") | [<img src="https://avatars3.githubusercontent.com/u/1239401?v=4" width="100px;"/><br /><sub><b>Johann Hubert Sonntagbauer</b></sub>](https://github.com/johann-sonntagbauer)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=johann-sonntagbauer "Code") [📖](https://github.com/kentcdodds/react-testing-library/commits?author=johann-sonntagbauer "Documentation") [⚠️](https://github.com/kentcdodds/react-testing-library/commits?author=johann-sonntagbauer "Tests") |
 | [<img src="https://avatars2.githubusercontent.com/u/2224291?v=4" width="100px;"/><br /><sub><b>Maddi Joyce</b></sub>](http://www.maddijoyce.com)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=maddijoyce "Code") | [<img src="https://avatars2.githubusercontent.com/u/10080111?v=4" width="100px;"/><br /><sub><b>Ryan Vice</b></sub>](http://www.vicesoftware.com)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=RyanAtViceSoftware "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/7942604?v=4" width="100px;"/><br /><sub><b>Ian Wilson</b></sub>](https://ianwilson.io)<br />[📝](#blog-iwilsonq "Blogposts") [✅](#tutorial-iwilsonq "Tutorials") | [<img src="https://avatars2.githubusercontent.com/u/1635491?v=4" width="100px;"/><br /><sub><b>Daniel</b></sub>](https://github.com/InExtremaRes)<br />[🐛](https://github.com/kentcdodds/react-testing-library/issues?q=author%3AInExtremaRes "Bug reports") [💻](https://github.com/kentcdodds/react-testing-library/commits?author=InExtremaRes "Code") | [<img src="https://avatars0.githubusercontent.com/u/767959?v=4" width="100px;"/><br /><sub><b>Giorgio Polvara</b></sub>](https://twitter.com/Gpx)<br />[🐛](https://github.com/kentcdodds/react-testing-library/issues?q=author%3AGpx "Bug reports") [🤔](#ideas-Gpx "Ideas, Planning, & Feedback") | [<img src="https://avatars2.githubusercontent.com/u/132233?v=4" width="100px;"/><br /><sub><b>John Gozde</b></sub>](https://github.com/jgoz)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=jgoz "Code") | [<img src="https://avatars0.githubusercontent.com/u/8203211?v=4" width="100px;"/><br /><sub><b>Sam Horton</b></sub>](https://twitter.com/SavePointSam)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=SavePointSam "Documentation") [💡](#example-SavePointSam "Examples") [🤔](#ideas-SavePointSam "Ideas, Planning, & Feedback") |
 | [<img src="https://avatars2.githubusercontent.com/u/10452163?v=4" width="100px;"/><br /><sub><b>Richard Kotze (mobile)</b></sub>](http://www.richardkotze.com)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=rkotze "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/10819833?v=4" width="100px;"/><br /><sub><b>Brahian E. Soto Mercedes</b></sub>](https://github.com/sotobuild)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=sotobuild "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/7151559?v=4" width="100px;"/><br /><sub><b>Benoit de La Forest</b></sub>](https://github.com/bdelaforest)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=bdelaforest "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/6624197?v=4" width="100px;"/><br /><sub><b>Salah</b></sub>](https://github.com/thesalah)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=thesalah "Code") [⚠️](https://github.com/kentcdodds/react-testing-library/commits?author=thesalah "Tests") | [<img src="https://avatars2.githubusercontent.com/u/370054?v=4" width="100px;"/><br /><sub><b>Adam Gordon</b></sub>](http://gordonizer.com)<br />[🐛](https://github.com/kentcdodds/react-testing-library/issues?q=author%3Aicfantv "Bug reports") [💻](https://github.com/kentcdodds/react-testing-library/commits?author=icfantv "Code") | [<img src="https://avatars2.githubusercontent.com/u/471278?v=4" width="100px;"/><br /><sub><b>Matija Marohnić</b></sub>](https://silvenon.com)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=silvenon "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/8015514?v=4" width="100px;"/><br /><sub><b>Justice Mba</b></sub>](https://github.com/Dajust)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=Dajust "Documentation") |
-| [<img src="https://avatars2.githubusercontent.com/u/5286559?v=4" width="100px;"/><br /><sub><b>Mark Pollmann</b></sub>](https://markpollmann.com/)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=MarkPollmann "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/1213123?v=4" width="100px;"/><br /><sub><b>Ehtesham Kafeel</b></sub>](https://github.com/ehteshamkafeel)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=ehteshamkafeel "Code") [📖](https://github.com/kentcdodds/react-testing-library/commits?author=ehteshamkafeel "Documentation") |
+| [<img src="https://avatars2.githubusercontent.com/u/5286559?v=4" width="100px;"/><br /><sub><b>Mark Pollmann</b></sub>](https://markpollmann.com/)<br />[📖](https://github.com/kentcdodds/react-testing-library/commits?author=MarkPollmann "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/1213123?v=4" width="100px;"/><br /><sub><b>Ehtesham Kafeel</b></sub>](https://github.com/ehteshamkafeel)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=ehteshamkafeel "Code") [📖](https://github.com/kentcdodds/react-testing-library/commits?author=ehteshamkafeel "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/1493505?v=4" width="100px;"/><br /><sub><b>Julio Pavón</b></sub>](http://jpavon.com)<br />[💻](https://github.com/kentcdodds/react-testing-library/commits?author=jpavon "Code") |
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 403137fd..604b8838 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -19,28 +19,65 @@ type TextMatchOptions = {
 }
 
 interface GetsAndQueries {
-  queryByTestId: BoundFunction<QueryByAttribute>
-  queryAllByTestId: BoundFunction<AllByAttribute>
-  getByTestId: BoundFunction<GetByAttribute>
-  getAllByTestId: BoundFunction<AllByAttribute>
-  queryByText: BoundFunction<QueryByText>
-  queryAllByText: BoundFunction<AllByText>
-  getByText: BoundFunction<GetByText>
-  getAllByText: BoundFunction<AllByText>
   queryByPlaceholderText: BoundFunction<QueryByAttribute>
   queryAllByPlaceholderText: BoundFunction<AllByAttribute>
   getByPlaceholderText: BoundFunction<GetByAttribute>
   getAllByPlaceholderText: BoundFunction<AllByAttribute>
-  queryByLabelText: BoundFunction<QueryByAttribute>
-  queryAllByLabelText: BoundFunction<AllByAttribute>
-  getByLabelText: BoundFunction<GetByAttribute>
-  getAllByLabelText: BoundFunction<AllByAttribute>
+  queryByText: BoundFunction<QueryByText>
+  queryAllByText: BoundFunction<AllByText>
+  getByText: BoundFunction<GetByText>
+  getAllByText: BoundFunction<AllByText>
+  queryByLabelText: BoundFunction<QueryByText>
+  queryAllByLabelText: BoundFunction<AllByText>
+  getByLabelText: BoundFunction<GetByText>
+  getAllByLabelText: BoundFunction<AllByText>
   queryByAltText: BoundFunction<QueryByAttribute>
   queryAllByAltText: BoundFunction<AllByAttribute>
   getByAltText: BoundFunction<GetByAttribute>
   getAllByAltText: BoundFunction<AllByAttribute>
+  queryByTestId: BoundFunction<QueryByAttribute>
+  queryAllByTestId: BoundFunction<AllByAttribute>
+  getByTestId: BoundFunction<GetByAttribute>
+  getAllByTestId: BoundFunction<AllByAttribute>
+  queryByTitle: BoundFunction<QueryByAttribute>
+  queryAllByTitle: BoundFunction<AllByAttribute>
+  getByTitle: BoundFunction<GetByAttribute>
+  getAllByTitle: BoundFunction<AllByAttribute>
+  queryByValue: BoundFunction<QueryByAttribute>
+  queryAllByValue: BoundFunction<AllByAttribute>
+  getByValue: BoundFunction<GetByAttribute>
+  getAllByValue: BoundFunction<AllByAttribute>
 }
 
+export const queryByPlaceholderText: QueryByAttribute
+export const queryAllByPlaceholderText: AllByAttribute
+export const getByPlaceholderText: GetByAttribute
+export const getAllByPlaceholderText: AllByAttribute
+export const queryByText: QueryByText
+export const queryAllByText: AllByText
+export const getByText: GetByText
+export const getAllByText: AllByText
+export const queryByLabelText: QueryByText
+export const queryAllByLabelText: AllByText
+export const getByLabelText: GetByText
+export const getAllByLabelText: AllByText
+export const queryByAltText: QueryByAttribute
+export const queryAllByAltText: AllByAttribute
+export const getByAltText: GetByAttribute
+export const getAllByAltText: AllByAttribute
+export const queryByTestId: QueryByAttribute
+export const queryAllByTestId: AllByAttribute
+export const getByTestId: GetByAttribute
+export const getAllByTestId: AllByAttribute
+export const queryByTitle: QueryByAttribute
+export const queryAllByTitle: AllByAttribute
+export const getByTitle: GetByAttribute
+export const getAllByTitle: AllByAttribute
+export const queryByValue: QueryByAttribute
+export const queryAllByValue: AllByAttribute
+export const getByValue: GetByAttribute
+export const getAllByValue: AllByAttribute
+
 export interface RenderResult extends GetsAndQueries {
   container: HTMLDivElement
   debug: () => void