Closes #26 and #27.