jl3yr Pull request

I hope I did this right