Closes #63, closes #67