epg now with regex only
Merge remote-tracking branch 'upstream/master'