I'll need to include this on QSTools config. But it's fine to merge that way