:lipstick: Wildcard matching

Added some wildcard matching to reduce LOC
Merge pull request #71 from deiga/patch-1

:lipstick: Wildcard matching