Fixed the substitution process.
Merge branch 'dev'

* dev:
  Fixed the substitution process.
  Fixed the variable regexp.