Agreed. Pull requests welcome.