Adding support for wildcard format - Fixes #1