Issue 142 wildcard codelist

Reflecting to backport 1.0.x also
Please review #142