Closes #89
Closes #90