Bugs fixed and more tests added. New '*' wildcard added.