BSPED have been a little quiet about this! Thank you @MDMarikar for drawing my attention to it.

Full post to follow soon, but here is the new calculator (click for interactive .pdf calculator)