Jon Faulkenberry's Pull Request

Here's mine. Thanks!