Pull Request by Kris

This is my pull request