Issue 142 wildcard codelist

Wildcard codelist modification 
Please review #142