Adding recent dev fix to this branch #88

Closed chadcwilliams closed 3 months ago