I will include that in my next PR, since I already merged this branch