closes #12, #10