Closes #86
Closes #78