Merge pull request #1 from Jermolene/master

sync with master
add Subsitutions in WikiText
add Subsitutions in WikiText
Merge pull request #992 from Eucaly/variables

add Subsitutions in WikiText