Closed dsajdak closed 1 year ago
Addresses issues #495 and #478
Replacing this with #519 because I messed up some git merges
Addresses issues #495 and #478