Adding macro expansion support. Fixed Windows bug with wildcard support.