Fork updates

Superseders #13.