Closes #12 and #10