- Addresses some of @rowanbeentje's feedback in pull #3