Closes #653.
Closes #17