New PR, on a new branch

Replacing #134.