Closes #17.
Closes #78.

#77