Kiyoshi Kamishima

@sujaygarlanka Thanks for taking a look into it. Please keep in mind that the solution I'd recommend is hardly a breaking change. Existing clients would just ignore an extra property...