I've implemented this enhancement on a fork and will commit upstream as it depends on the acceptance of #67

Sounds great! I'll assign this to you and will be looking forward to reviewing after passing the PR