Escape commands correctly
Merge