Fixes #40.
Fixes #41.