Good suggestion as well @andrerom, PR updated!