31: Added support for API 10.  However, API 10 not yet tested.