An OK solution :+1: to issue #24, could use some revisiting at a later date