moggleif

If you see something more that should be fixed before getting this approved. Please, just let me know and I will fix it. Sorry for several commits, I didn't realize...

I'm just wondering. Is this kind of update not wanted? I have seen several forks with the same issue and request on meta Discourse as well. Would be good to...