ud: added support for compound terms
Merge branch 'jd'