:+1: 

@TiuTalk are u planning to do that change? If not I can do it before merging the PR :)