Replace correctly when parsing php code.
Do not escape dump when in cli mode.
More character convertion functionality.
Merge branch 'master'