Closes #59 Closes #58