Added asterisk handling.
Fixed merge conflict