Added StrContains

Also tweaked StrExpand, so that it is now A LOT more flexible!