Sure, will add this to my branch for #563