Closes #11.
Closes #5.