Pull Request from smeggaly

This  is the message. I added some changes.