Just submitted my first pull request, hopefully I didn't make any mistakes