New in #98

Empties #32

New in #46