Added flag to match whole words only