Added wildcard support
Merge