Closes GitHub issue #50.
Closes GitHub issue #56.