Hi! I've implemented both features for my own use. Would you be interested in a Pull Request to merge this into the main repo?