Closes #118
Closes #122