fix null-value regex ( infinite loop bug )
Merge branch 'v2'

* v2:
  fix null-value regex ( infinite loop bug )