Totally agree! I will try to get it in this pull request too.