Closes #88, #90