Closes #65 and #73.