Merge pull request #475 from WildcardSearch/fix-336

Addressing #336