Update to latest kyoto api
Merge?