-*-iri-*- extracted default args
Merge branch 'master' of github.com:mirco89/uni