Fixes #<issue_number_goes_here>
It's a good idea to open an issue first for discussion.
[ ] Tests pass
[ ] Tests and examples for any new features.
[ ] Appropriate changes to README are included in PR