Closes #26 and #25.