Thanks for the suggestions! A PR is create here.