Resolves #386 - Fixes panic and improve execution performance #387

Closed steve-r-west closed 1 year ago