Wildcard

Merging wildcard support branch