Gossman's Pull Request

Hello Clayton :) here's my pull request. Enjoy