Fixed escape string and some includes
Revert ""

This reverts commit b0891f16497767242f2756845d8dd088f9e4937b.
Merge origin/master
Fixed escape string and some includes