Fixes #<issue_number_goes_here> (it's a good idea to open an issue first for discussion)

• Tests pass
• Appropriate docs were updated (if necessary)