Closes #10