"Closes #84"