Pull Request: Enhancements

Hi Sir Hyubs!

I don't know exactly how this works. :))