Closes #59