matthewasage

Do we have any good guy who could submit a pull request for this? I wish I could do it but I'm on my phone only for the next couple...

I have submitted a PR including the most recent patch from @gary-stu