Closes #15 and #17.