Closes #58.
Closes #41.