Let me know when you test and are sure it's working fine and I'll merge