Closes #59, Closes #68