Close #187: No more problem with escaping.
Merge remote-tracking branch 'origin/develop' into develop