Merge branch 'main' of https://github.com/ponder-lab/Hybridize-Functions-Refactoring

Author: khatchad