Closed chris-wood closed 7 months ago
Closes #445
Took @tgeoghegan's suggestion, rebased, and squahsed.
Closes #445