introduced bundler
added correct handling for escaped strings