new support for unset mode (no escape)
Merge branch 'origin/master'