Closes #70
Closes #68