Closes GH-59