Added wildcard support for WCONINJE as well
Added some files missing from last commit