Updated to use new version of Yaz (some names changed to avoid C++ conflict).