machavity

I've tried multiple times to keep this to JUST the changes I've made but something in PHPStorm or git wants to fix it. So *some* lines show changed, but it's...

I thought about submitting a patch but I'm not sure that this wasn't on my end. Still, I wanted to mention it in case you wanted to add this in...