Wasn't sure if this working with the current coding style but totally +1. Update coming.