Closes #59, closes #60