Merge pull request #155 from acz-icm/master

UDF and disambiguation-work