Wildcard bugfixes.
Context enhancement.
Merge pull request #1 from lfbittencourt/master

Fixes.