extractor rgx improvements

neonknight requested to merge neonknight:master into master May 03, 2017