From d903ecbfcab8b14cd87fd61a0f3fa38a82bd744e Mon Sep 17 00:00:00 2001
From: bablosoft <mail.to.twaego@gmail.com>
Date: Tue, 12 Jul 2016 04:27:33 +0300
Subject: [PATCH] Version 12.3.0

---
 ChromeWorker/ChromeWorker.pro                 |  10 +-
 ChromeWorker/browserdata.h                    |   6 +
 ChromeWorker/commandparser.cpp                |  25 ++
 ChromeWorker/commandparser.h                  |   3 +
 ChromeWorker/curlresourcehandler.cpp          |  12 +
 ChromeWorker/curlresourcehandler.h            |   2 +
 ChromeWorker/devtoolshandler.cpp              |  84 ++++-
 ChromeWorker/devtoolshandler.h                |  17 +-
 ChromeWorker/handlersmanager.cpp              | 219 ++++++++++++
 ChromeWorker/handlersmanager.h                |  68 ++++
 .../html/toolbox/expressioneditor.css         |   5 +
 ChromeWorker/html/toolbox/expressioneditor.js |   4 +-
 ChromeWorker/html/toolbox/index.html          |  81 ++++-
 ChromeWorker/html/toolbox/style.css           |   2 +-
 ChromeWorker/html/toolbox/translate.js        |   7 +-
 ChromeWorker/main.cpp                         |   2 +
 ChromeWorker/mainapp.cpp                      | 317 +++++++++---------
 ChromeWorker/mainapp.h                        |  14 +-
 ChromeWorker/mainhandler.cpp                  | 113 ++++++-
 ChromeWorker/mainhandler.h                    |  22 +-
 ChromeWorker/multithreading.h                 |   8 +-
 ChromeWorker/refcountpublic.h                 |  18 +
 Engine/ibrowser.h                             |   2 +
 Engine/irecordprocesscommunication.h          |   1 +
 Engine/qtresourcecontroller.cpp               |   1 +
 Engine/recordprocesscommunication.cpp         |   6 +
 Engine/recordprocesscommunication.h           |   1 +
 Engine/scripts/engine/common/helpers.js       |  15 +
 Engine/scripts/engine/worker/worker.js        |  18 +
 Engine/subprocessbrowser.cpp                  |  34 +-
 Engine/subprocessbrowser.h                    |   4 +
 Engine/text/apilist.txt                       |   2 +
 Engine/translate/ru.qm                        | Bin 62469 -> 62611 bytes
 Engine/versioninfo.cpp                        |   2 +-
 Modules/ReCaptcha2/js/captcha2_code.js        |  73 +++-
 Modules/ReCaptcha2/js/engine.js               |  70 ++--
 Modules/ReCaptcha2/js/manifest.json           |   2 +-
 Studio/mainwindow.cpp                         |   4 +
 38 files changed, 1029 insertions(+), 245 deletions(-)
 create mode 100644 ChromeWorker/handlersmanager.cpp
 create mode 100644 ChromeWorker/handlersmanager.h

diff --git a/ChromeWorker/ChromeWorker.pro b/ChromeWorker/ChromeWorker.pro
index cee5ef4..6d63fe3 100644
--- a/ChromeWorker/ChromeWorker.pro
+++ b/ChromeWorker/ChromeWorker.pro
@@ -43,15 +43,16 @@ SOURCES += main.cpp \
     replaceall.cpp \
     convertencoding.cpp \
     fixcontentcharset.cpp \
-    extract_resources.cpp
+    extract_resources.cpp \
+    handlersmanager.cpp
 
 INCLUDEPATH += $(BAS_PATH_WORKER)/include
 
 
-LIBS += -L$(BAS_PATH_WORKER)/lib -llibiconv -llibcef -lcef_sandbox -llibcef_dll_wrapper -lAdvapi32 -luser32 -lPsapi -lshell32 -lDbgHelp -lgdi32 -llibcurl -llibeay32 -lssleay32 -lnetwork-uri
+LIBS += -L$(BAS_PATH_WORKER)/lib -llibiconv -llibcef -llibcef_dll_wrapper -lAdvapi32 -luser32 -lPsapi -lshell32 -lDbgHelp -lgdi32 -llibcurl -llibeay32 -lssleay32 -lnetwork-uri
 QMAKE_CXXFLAGS_RELEASE += /MT
 
-QMAKE_CXXFLAGS_DEBUG += /MTd /FS
+QMAKE_CXXFLAGS_DEBUG += /MTd
 
 HEADERS += \
     mainapp.h \
@@ -97,7 +98,8 @@ HEADERS += \
     replaceall.h \
     convertencoding.h \
     fixcontentcharset.h \
-    extract_resources.h
+    extract_resources.h \
+    handlersmanager.h
 
 INCLUDEPATH += xml json png
 
diff --git a/ChromeWorker/browserdata.h b/ChromeWorker/browserdata.h
index 510bfa4..fff898b 100644
--- a/ChromeWorker/browserdata.h
+++ b/ChromeWorker/browserdata.h
@@ -36,6 +36,12 @@ class BrowserData
     InspectResult _Inspect;
     ModulesDataList _ModulesData;
 
+    //Dialogs
+    std::string _PromptResult;
+    std::string _HttpAuthLogin;
+    std::string _HttpAuthPassword;
+
+
     //Reset
     std::atomic_bool IsReset;
     std::atomic_bool IsAboutBlankLoaded;
diff --git a/ChromeWorker/commandparser.cpp b/ChromeWorker/commandparser.cpp
index ae041e0..38c1413 100644
--- a/ChromeWorker/commandparser.cpp
+++ b/ChromeWorker/commandparser.cpp
@@ -1,6 +1,7 @@
 #include "commandparser.h"
 #include "rapidxml.hpp"
 #include "log.h"
+#include "split.h"
 
 CommandParser::CommandParser()
 {
@@ -125,6 +126,30 @@ void CommandParser::Parse(const std::string& Xml)
                 f(value);
         }
 
+        CommandNode = MessagesNode->first_node("SetPromptResult");
+        if(CommandNode)
+        {
+            std::string value = CommandNode->value();
+            worker_log("EventSetPromptResult");
+            for(auto f:EventSetPromptResult)
+                f(value);
+        }
+
+        CommandNode = MessagesNode->first_node("SetHttpAuthResult");
+        if(CommandNode)
+        {
+            std::string value = CommandNode->value();
+            std::vector<std::string> s = split(value,':');
+            if(s.size() == 2)
+            {
+                std::string login = s[0];
+                std::string password = s[1];
+                worker_log("EventSetHttpAuthResult");
+                for(auto f:EventSetHttpAuthResult)
+                    f(login,password);
+            }
+        }
+
         CommandNode = MessagesNode->first_node("GetCookiesForUrl");
         if(CommandNode)
         {
diff --git a/ChromeWorker/commandparser.h b/ChromeWorker/commandparser.h
index 2bcb9d3..bb4c1fb 100644
--- a/ChromeWorker/commandparser.h
+++ b/ChromeWorker/commandparser.h
@@ -21,6 +21,9 @@ class CommandParser
     std::vector<std::function<void(const std::string&, const std::string&)> > EventAddHeader;
     std::vector<std::function<void(const std::string&)> > EventSetUserAgent;
     std::vector<std::function<void(const std::string&)> > EventSetOpenFileName;
+    std::vector<std::function<void(const std::string&)> > EventSetPromptResult;
+    std::vector<std::function<void(const std::string&,const std::string&)> > EventSetHttpAuthResult;
+
     std::vector<std::function<void()> > EventGetUrl;
     std::vector<std::function<void(int, int)> > EventResize;
     std::vector<std::function<void(const std::string&)> > EventSetWindow;
diff --git a/ChromeWorker/curlresourcehandler.cpp b/ChromeWorker/curlresourcehandler.cpp
index 5520144..15fa04c 100644
--- a/ChromeWorker/curlresourcehandler.cpp
+++ b/ChromeWorker/curlresourcehandler.cpp
@@ -191,6 +191,12 @@ void CurlThreadFunction(CurlResourceHandler::CurlThreadDataClass * Data)
             curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,Data->ProxyAuth.c_str());
     }
 
+    if(!Data->HttpAuthLogin.empty() && !Data->HttpAuthPassword.empty())
+    {
+        curl_easy_setopt(curl_handle,CURLOPT_USERNAME,Data->HttpAuthLogin.c_str());
+        curl_easy_setopt(curl_handle,CURLOPT_PASSWORD,Data->HttpAuthPassword.c_str());
+    }
+
     //if(write_logs)
     //{
         //curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L);
@@ -300,6 +306,12 @@ bool CurlResourceHandler::ProcessRequest(CefRefPtr<CefRequest> request, CefRefPt
         CurlThreadData.ProxyAuth = _BrowserData->_Proxy.AuthToString();
     }
 
+    {
+        LOCK_HTTP_AUTH
+        CurlThreadData.HttpAuthLogin = _BrowserData->_HttpAuthLogin;
+        CurlThreadData.HttpAuthPassword = _BrowserData->_HttpAuthPassword;
+    }
+
     CefRequest::HeaderMap ReqestHeaderMap;
     request->GetHeaderMap(ReqestHeaderMap);
 
diff --git a/ChromeWorker/curlresourcehandler.h b/ChromeWorker/curlresourcehandler.h
index 18296a0..46be00d 100644
--- a/ChromeWorker/curlresourcehandler.h
+++ b/ChromeWorker/curlresourcehandler.h
@@ -51,6 +51,8 @@ class CurlResourceHandler : public CefResourceHandler
             std::vector<char> PostData;
             std::string Proxy;
             std::string ProxyAuth;
+            std::string HttpAuthLogin;
+            std::string HttpAuthPassword;
 
             /* Sync */
             std::atomic_bool StopRequest = false;
diff --git a/ChromeWorker/devtoolshandler.cpp b/ChromeWorker/devtoolshandler.cpp
index 3ae8ce4..9f79886 100644
--- a/ChromeWorker/devtoolshandler.cpp
+++ b/ChromeWorker/devtoolshandler.cpp
@@ -4,6 +4,8 @@
 DevToolsHandler::DevToolsHandler()
 {
     OpenAfterClose = false;
+    DoClose = false;
+    DevToolsBrowserId = -1;
 }
 
 void DevToolsHandler::SetData(BrowserData *Data)
@@ -11,6 +13,18 @@ void DevToolsHandler::SetData(BrowserData *Data)
     this->Data = Data;
 }
 
+void DevToolsHandler::SetLayout(MainLayout *Layout)
+{
+    this->Layout = Layout;
+}
+
+
+void DevToolsHandler::SetHandlersManager(HandlersManager *_HandlersManager)
+{
+    this->_HandlersManager = _HandlersManager;
+    this->_HandlersManager->EventNeedToCloseDevTools.push_back(std::bind(&DevToolsHandler::CloseDevTools,this));
+}
+
 void DevToolsHandler::Timer()
 {
     if(OpenAfterClose)
@@ -24,18 +38,80 @@ void DevToolsHandler::Timer()
             window_info.SetAsChild(Data->_MainWindowHandle, rect);
             CefBrowserSettings browser_settings;
 
-            Browser->GetHost()->ShowDevTools(window_info, Handler, browser_settings, Point);
+            _HandlersManager->GetBrowser()->GetHost()->ShowDevTools(window_info, this, browser_settings, Point);
+
+        }
+    }
+
+    if(DoClose)
+    {
+        AfterCloseTimer--;
+        if(AfterCloseTimer<0)
+        {
+            DoClose = false;
+            DevToolsBrowserId = -1;
+            //OpenDevTools();
         }
     }
 }
 
-void DevToolsHandler::OpenNewDevTools(CefPoint Point,CefRefPtr<DevToolsHandler> Handler,CefRefPtr<CefBrowser> Browser, RECT rect)
+void DevToolsHandler::OpenDevTools()
 {
+    if(DevToolsBrowserId > 0)
+        return;
+    CefWindowInfo window_info;
+    RECT rect = Layout->GetDevToolsRectangle(Data->WidthBrowser,Data->HeightBrowser,Data->WidthAll,Data->HeightAll);
+    window_info.SetAsChild(Data->_MainWindowHandle, rect);
+    CefBrowserSettings browser_settings;
+    _HandlersManager->GetBrowser()->GetHost()->ShowDevTools(window_info, this, browser_settings, CefPoint(0,0));
+    DevToolsBrowserId = _HandlersManager->GetBrowser()->GetIdentifier();
+    //_HandlersManager->SetDevToolsBorwserId(DevToolsBrowserId);
+}
+
+void DevToolsHandler::OpenDevTools(CefPoint Point)
+{
+    if(DoClose)
+        return;
+
+    if(OpenAfterClose)
+        return;
+
+    RECT rect = Layout->GetDevToolsRectangle(Data->WidthBrowser,Data->HeightBrowser,Data->WidthAll,Data->HeightAll);
+    HWND HDevTools = Layout->GetDevToolsHandle();
+    if(HDevTools)
+    {
+        DestroyWindow(HDevTools);
+    }
+
     OpenAfterClose = true;
     AfterCloseTimer = 10;
 
     this->Point = Point;
-    this->Handler = Handler;
-    this->Browser = Browser;
     this->rect = rect;
+
+    DevToolsBrowserId = _HandlersManager->GetBrowser()->GetIdentifier();
+    //_HandlersManager->SetDevToolsBorwserId(DevToolsBrowserId);
+}
+
+void DevToolsHandler::CloseDevTools()
+{
+    if(DoClose)
+        return;
+
+    if(OpenAfterClose)
+        return;
+
+    if(DevToolsBrowserId < 0)
+        return;
+
+    HWND HDevTools = Layout->GetDevToolsHandle();
+    if(HDevTools)
+    {
+        DestroyWindow(HDevTools);
+        DoClose = true;
+        AfterCloseTimer = 10;
+    }
+
+
+
 }
diff --git a/ChromeWorker/devtoolshandler.h b/ChromeWorker/devtoolshandler.h
index 9affa18..de3e59f 100644
--- a/ChromeWorker/devtoolshandler.h
+++ b/ChromeWorker/devtoolshandler.h
@@ -2,24 +2,33 @@
 #define DEVTOOLSHANDLER_H
 #include "include/cef_client.h"
 #include "browserdata.h"
+#include "handlersmanager.h"
+#include "mainlayout.h"
 
 class DevToolsHandler : public CefClient
 {
 
     CefPoint Point;
-    CefRefPtr<DevToolsHandler> Handler;
-    CefRefPtr<CefBrowser> Browser;
+    HandlersManager *_HandlersManager = 0;
     RECT rect;
     BrowserData *Data;
+    MainLayout *Layout;
 
     bool OpenAfterClose;
+    bool DoClose;
+
     int AfterCloseTimer;
+    int DevToolsBrowserId;
+
 public:
     DevToolsHandler();
 
     void SetData(BrowserData *Data);
-
-    void OpenNewDevTools(CefPoint Point,CefRefPtr<DevToolsHandler> Handler,CefRefPtr<CefBrowser> Browser, RECT rect);
+    void SetLayout(MainLayout *Layout);
+    void SetHandlersManager(HandlersManager *_HandlersManager);
+    void OpenDevTools();
+    void OpenDevTools(CefPoint Point);
+    void CloseDevTools();
     void Timer();
 private:
     IMPLEMENT_REFCOUNTING(DevToolsHandler);
diff --git a/ChromeWorker/handlersmanager.cpp b/ChromeWorker/handlersmanager.cpp
new file mode 100644
index 0000000..41094d9
--- /dev/null
+++ b/ChromeWorker/handlersmanager.cpp
@@ -0,0 +1,219 @@
+#include "handlersmanager.h"
+#include "include/base/cef_bind.h"
+#include "include/wrapper/cef_closure_task.h"
+#include "multithreading.h"
+#include <functional>
+
+using namespace std::placeholders;
+
+void HandlersManager::Init1(CefRefPtr<MainHandler> Handler,std::function<void(const std::string&)> SendTextResponceCallback,std::function<void(const std::string&, int)> UrlLoadedCallback,std::function<void()> LoadSuccessCallback,std::function<void(char*,int,int)> PaintCallback)
+{
+    this->Handler.swap(Handler);
+    this->SendTextResponceCallback = SendTextResponceCallback;
+    this->UrlLoadedCallback = UrlLoadedCallback;
+    this->LoadSuccessCallback = LoadSuccessCallback;
+    this->PaintCallback = PaintCallback;
+
+    this->Handler->EventLoadSuccess.push_back(std::bind(&HandlersManager::LoadSuccess,this,_1));
+    this->Handler->EventPaint.push_back(std::bind(&HandlersManager::Paint,this,_1,_2,_3,_4));
+    this->Handler->EventSendTextResponce.push_back(std::bind(&HandlersManager::SendTextResponce,this,_1,_2));
+    this->Handler->EventUrlLoaded.push_back(std::bind(&HandlersManager::UrlLoaded,this,_1,_2,_3));
+
+    this->Handler->EventPopupClosed.push_back(std::bind(&HandlersManager::PopupRemoved,this,_1));
+    this->Handler->EventPopupCreated.push_back(std::bind(&HandlersManager::PopupCreated,this,_1,_2));
+}
+
+void HandlersManager::Init2(CefRefPtr<CefBrowser> Browser)
+{
+    OriginalHandler = std::make_shared<HandlerUnitClass>();
+    OriginalHandler->Handler = this->Handler;
+    OriginalHandler->Browser = Browser;
+    OriginalHandler->BrowserId = Browser->GetIdentifier();
+    OriginalHandler->IsActive = true;
+
+    UpdateCurrent();
+}
+
+void HandlersManager::UpdateCurrent()
+{
+    bool IsPopupActive = false;
+    for(HandlerUnit h:HandlerUnits)
+    {
+        if(h->IsActive && !h->DontUseAsActive && h->IsContextCreated)
+        {
+            IsPopupActive = true;
+            Handler = h->Handler;
+            Browser = h->Browser;
+        }
+    }
+
+    if(!IsPopupActive && OriginalHandler)
+    {
+        Handler = OriginalHandler->Handler;
+        Browser = OriginalHandler->Browser;
+    }
+
+    CurrentBrowserId = -1;
+    if(Browser)
+        CurrentBrowserId = Browser->GetIdentifier();
+}
+
+MainHandler* HandlersManager::GetHandler()
+{
+    return Handler.get();
+}
+
+CefBrowser* HandlersManager::GetBrowser()
+{
+    return Browser.get();
+}
+
+void HandlersManager::Timer()
+{
+    std::vector<int> Ids;
+    {
+        LOCK_CONTEXT_LIST
+        Ids = std::move(NewContextCreatedIds);
+        NewContextCreatedIds.clear();
+    }
+
+    bool Updated = false;
+
+
+    for(HandlerUnit h:HandlerUnits)
+    {
+        if(std::find(Ids.begin(), Ids.end(), h->BrowserId) != Ids.end())
+        {
+            h->IsContextCreated = true;
+            Updated = true;
+        }
+    }
+
+    auto i = HandlerUnits.begin();
+    while (i != HandlerUnits.end())
+    {
+        if(!(*i)->IsActive && (*i)->Handler->ref_count_.ref_count_ == 2 && (*i)->Handler->GetResourceListLength() == 0)
+        {
+            (*i)->Browser = 0;
+
+            MainHandler *h = (*i)->Handler.get();
+            (*i)->Handler = 0;
+            delete h;
+
+            i = HandlerUnits.erase(i);
+
+            Updated = true;
+        }else
+        {
+            MainHandler *h = (*i)->Handler.get();
+            CefPostTask(TID_IO, base::Bind(&MainHandler::CleanResourceHandlerList, h));
+
+            ++i;
+        }
+    }
+    if(OriginalHandler)
+    {
+        MainHandler *h = OriginalHandler->Handler.get();
+        CefPostTask(TID_IO, base::Bind(&MainHandler::CleanResourceHandlerList, h));
+    }else
+    {
+        MainHandler *h = Handler.get();
+        CefPostTask(TID_IO, base::Bind(&MainHandler::CleanResourceHandlerList, h));
+    }
+    if(Updated)
+        UpdateCurrent();
+}
+
+void HandlersManager::Reset()
+{
+    for(HandlerUnit h:HandlerUnits)
+    {
+        h->DontUseAsActive = true;
+        h->Browser->GetHost()->CloseBrowser(true);
+    }
+    UpdateCurrent();
+
+}
+
+void HandlersManager::PopupCreated(CefRefPtr<MainHandler> new_handler,CefRefPtr<CefBrowser> new_browser)
+{
+    HandlerUnit p = std::make_shared<HandlerUnitClass>();
+    p->Handler = new_handler;
+    p->Browser = new_browser;
+    p->BrowserId = new_browser->GetIdentifier();
+    p->IsActive = true;
+    p->DontUseAsActive = false;
+
+
+    p->Handler->EventLoadSuccess.clear();
+    p->Handler->EventPaint.clear();
+    p->Handler->EventSendTextResponce.clear();
+    p->Handler->EventUrlLoaded.clear();
+    p->Handler->EventPopupClosed.clear();
+    p->Handler->EventPopupCreated.clear();
+
+
+    p->Handler->EventLoadSuccess.push_back(std::bind(&HandlersManager::LoadSuccess,this,_1));
+    p->Handler->EventPaint.push_back(std::bind(&HandlersManager::Paint,this,_1,_2,_3,_4));
+    p->Handler->EventSendTextResponce.push_back(std::bind(&HandlersManager::SendTextResponce,this,_1,_2));
+    p->Handler->EventUrlLoaded.push_back(std::bind(&HandlersManager::UrlLoaded,this,_1,_2,_3));
+
+    p->Handler->EventPopupClosed.push_back(std::bind(&HandlersManager::PopupRemoved,this,_1));
+    p->Handler->EventPopupCreated.push_back(std::bind(&HandlersManager::PopupCreated,this,_1,_2));
+
+    HandlerUnits.push_back(p);
+
+    UpdateCurrent();
+}
+
+void HandlersManager::PopupRemoved(int BrowserId)
+{
+    for(HandlerUnit h:HandlerUnits)
+    {
+        if(h->BrowserId == BrowserId)
+        {
+            h->IsActive = false;
+
+            //if(DevToolsBorwserId == h->BrowserId)
+            {
+                for(auto f:EventNeedToCloseDevTools)
+                    f();
+            }
+        }
+    }
+    UpdateCurrent();
+
+}
+void HandlersManager::SendTextResponce(const std::string& text, int BrowserId)
+{
+    if(CurrentBrowserId == BrowserId)
+        SendTextResponceCallback(text);
+}
+void HandlersManager::UrlLoaded(const std::string& url, int status, int BrowserId)
+{
+    if(CurrentBrowserId == BrowserId)
+        UrlLoadedCallback(url, status);
+}
+void HandlersManager::LoadSuccess(int BrowserId)
+{
+    if(CurrentBrowserId == BrowserId)
+        LoadSuccessCallback();
+}
+void HandlersManager::Paint(char * data, int width, int height, int BrowserId)
+{
+    if(CurrentBrowserId == BrowserId)
+        PaintCallback(data,width,height);
+}
+
+void HandlersManager::NewContextCreated(int ContextId)
+{
+    LOCK_CONTEXT_LIST
+    NewContextCreatedIds.push_back(ContextId);
+}
+
+void HandlersManager::SetDevToolsBorwserId(int DevToolsBorwserId)
+{
+    this->DevToolsBorwserId = DevToolsBorwserId;
+}
+
+
diff --git a/ChromeWorker/handlersmanager.h b/ChromeWorker/handlersmanager.h
new file mode 100644
index 0000000..577853f
--- /dev/null
+++ b/ChromeWorker/handlersmanager.h
@@ -0,0 +1,68 @@
+#ifndef HANDLERSMANAGER_H
+#define HANDLERSMANAGER_H
+
+#include <vector>
+#include <memory>
+#include "include/cef_app.h"
+#include "mainhandler.h"
+
+class HandlersManager
+{
+    struct HandlerUnitClass
+    {
+        CefRefPtr<MainHandler> Handler;
+        CefRefPtr<CefBrowser> Browser;
+        int BrowserId = -1;
+        bool IsActive = true;
+        bool DontUseAsActive = false;
+        bool IsContextCreated = false;
+    };
+    using HandlerUnit = std::shared_ptr<HandlerUnitClass>;
+
+    std::vector<HandlerUnit> HandlerUnits;
+    HandlerUnit OriginalHandler;
+
+    /* Callbacks */
+    void PopupCreated(CefRefPtr<MainHandler> new_handler,CefRefPtr<CefBrowser> new_browser);
+    void PopupRemoved(int BrowserId);
+    void SendTextResponce(const std::string& text, int BrowserId);
+    void UrlLoaded(const std::string& url, int status, int BrowserId);
+    void LoadSuccess(int BrowserId);
+    void Paint(char * data, int width, int height, int BrowserId);
+
+
+    int CurrentBrowserId = -1;
+    int DevToolsBorwserId = -1;
+
+
+    CefRefPtr<MainHandler> Handler;
+    CefRefPtr<CefBrowser> Browser;
+
+    std::function<void(const std::string&)> SendTextResponceCallback;
+    std::function<void(const std::string&, int)> UrlLoadedCallback;
+    std::function<void()> LoadSuccessCallback;
+    std::function<void(char*,int,int)> PaintCallback;
+
+    std::vector<int> NewContextCreatedIds;
+
+    void UpdateCurrent();
+
+public:
+    void Reset();
+    void Timer();
+    MainHandler* GetHandler();
+    CefBrowser* GetBrowser();
+    void NewContextCreated(int ContextId);
+    void Init1(CefRefPtr<MainHandler> Handler,
+               std::function<void(const std::string&)> SendTextResponceCallback,
+               std::function<void(const std::string&, int)> UrlLoadedCallback,
+               std::function<void()> LoadSuccessCallback,
+               std::function<void(char*,int,int)> PaintCallback
+               );
+    void Init2(CefRefPtr<CefBrowser> Browser);
+
+    std::vector<std::function<void()> > EventNeedToCloseDevTools;
+    void SetDevToolsBorwserId(int DevToolsBorwserId);
+};
+
+#endif // HANDLERSMANAGER_H
diff --git a/ChromeWorker/html/toolbox/expressioneditor.css b/ChromeWorker/html/toolbox/expressioneditor.css
index d3227d9..addc550 100644
--- a/ChromeWorker/html/toolbox/expressioneditor.css
+++ b/ChromeWorker/html/toolbox/expressioneditor.css
@@ -204,6 +204,11 @@ body
  z-index:99999999; 
 }
 
+#FunctionModal
+{
+ z-index:99999999; 
+}
+
 .expressioneditor-overlay-buttons .btn
 {
   min-width:100px;
diff --git a/ChromeWorker/html/toolbox/expressioneditor.js b/ChromeWorker/html/toolbox/expressioneditor.js
index e21ebf1..9a81300 100644
--- a/ChromeWorker/html/toolbox/expressioneditor.js
+++ b/ChromeWorker/html/toolbox/expressioneditor.js
@@ -444,8 +444,8 @@
 
                 /* Random */
                 {name: "random number", description: "Generate random number", code: "Math.floor(Math.random() * (<<0>> - <<1>> + 1)) + <<1>>", params: [{name: "max"},{name: "min"}]},
-                {name: "random string", description: "Generate random string", code: "Array(<<0>>).join().split(',').map(function() { return \"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\".charAt(Math.floor(Math.random() * 62)); }).join('');", params: [{name: "length"}]},
-                {name: "random alphabet", description: "Generate random string, with given alphabet. Alphabet is just a string, for example, if alphabet is 01 action will generate random binary number", code: "Array(<<1>>).join().split(',').map(function() { return (<<0>>).charAt(Math.floor(Math.random() * <<0>>.length)); }).join('');", params: [{name: "alphabet"},{name: "length"}]},
+                {name: "random string", description: "Generate random string", code: "Array(<<0>>).join().split(',').map(function() { return \"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\".charAt(Math.floor(Math.random() * 62)); }).join('')", params: [{name: "length"}]},
+                {name: "random alphabet", description: "Generate random string, with given alphabet. Alphabet is just a string, for example, if alphabet is 01 action will generate random binary number", code: "Array(<<1>>).join().split(',').map(function() { return (<<0>>).charAt(Math.floor(Math.random() * <<0>>.length)); }).join('')", params: [{name: "alphabet"},{name: "length"}]},
 
                 
                 /* Array */
diff --git a/ChromeWorker/html/toolbox/index.html b/ChromeWorker/html/toolbox/index.html
index 5eae4c4..87afe72 100644
--- a/ChromeWorker/html/toolbox/index.html
+++ b/ChromeWorker/html/toolbox/index.html
@@ -355,7 +355,7 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
 
   <script type="text/template" id="custom">
     <div class="container-fluid custom">
-      <%= _.template($('#input_constructor').html())({id:"Code", description:tr("Custom Code"), default_selector: "expression", disable_int:true, disable_string:true, use_textarea:true, size: 8, disable_type_chooser:true}) %>
+      <%= _.template($('#input_constructor').html())({id:"Code", description:tr("Custom Code"), default_selector: "expression", disable_int:true, disable_editor:true, disable_string:true, use_textarea:true, size: 8, disable_type_chooser:true}) %>
     </div>
     <%= _.template($('#back').html())({action:"executeandadd", visible:true}) %>
   </script>
@@ -462,6 +462,21 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
     <%= _.template($('#back').html())({action:"executeandadd", visible:true}) %>
   </script>
 
+  <script type="text/template" id="promptresult">
+    <div class="container-fluid promptresult">
+      <%= _.template($('#input_constructor').html())({id:"Value", description:tr("Prompt user input result"), default_selector: "string", disable_int:true}) %>
+    </div>
+    <%= _.template($('#back').html())({action:"executeandadd", visible:true}) %>
+  </script>
+
+  <script type="text/template" id="httpauth">
+    <div class="container-fluid httpauth">
+      <%= _.template($('#input_constructor').html())({id:"Login", description:tr("Http auth login"), default_selector: "string", disable_int:true}) %>
+      <%= _.template($('#input_constructor').html())({id:"Password", description:tr("Http auth password"), default_selector: "string", disable_int:true}) %>
+    </div>
+    <%= _.template($('#back').html())({action:"executeandadd", visible:true}) %>
+  </script>
+
   <script type="text/template" id="getcookiesforurl">
       <div class="container-fluid getcookiesforurl">
         <%= _.template($('#input_constructor').html())({id:"Value", description:tr("Url"), default_selector: "string", disable_int:true}) %>
@@ -2015,6 +2030,16 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
       open_file_dialog(<%= value %>)!
   </script>
 
+  <script type="text/template" id="promptresult_code">
+      /*Browser*/
+      prompt_result(<%= value %>)!
+  </script>
+
+  <script type="text/template" id="httpauth_code">
+      /*Browser*/
+      http_auth_result(<%= login %>,<%= password %>)!
+  </script>
+
   <script type="text/template" id="waitcontent_code">
       /*Browser*/
       wait_content(<%= waiter %>)!
@@ -3604,6 +3629,48 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
             }catch(e)
             {}
             
+          }else if(State == "promptresult")
+          {
+            var Value = GetInputConstructorValue("Value",loader)
+
+            if(Value["original"].length <= 0)
+            {
+              Invalid("Value is empty");
+              return;
+            }
+
+             try{
+              var code = loader.GetAdditionalData() + _.template($('#' + State + "_code").html())({value:Value["updated"]})
+              code = Normalize(code,0)
+              BrowserAutomationStudio_Append("Prompt result " + Value["original"], BrowserAutomationStudio_SaveControls() + code, action, DisableIfAdd);
+            }catch(e)
+            {}
+            
+          }else if(State == "httpauth")
+          {
+            var Login = GetInputConstructorValue("Login",loader)
+            var Password = GetInputConstructorValue("Password",loader)
+            
+
+            if(Login["original"].length <= 0)
+            {
+              Invalid("Login is empty");
+              return;
+            }
+
+            if(Password["original"].length <= 0)
+            {
+              Invalid("Password is empty");
+              return;
+            }
+
+             try{
+              var code = loader.GetAdditionalData() + _.template($('#' + State + "_code").html())({login:Login["updated"],password:Password["updated"]})
+              code = Normalize(code,0)
+              BrowserAutomationStudio_Append("Http Auth " + Login["original"] + ":" + Password["original"], BrowserAutomationStudio_SaveControls() + code, action, DisableIfAdd);
+            }catch(e)
+            {}
+            
           }else if(State == "javascript")
           {
             var Save = this.$el.find("#Save").val().toUpperCase();
@@ -4625,6 +4692,8 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
           "waitasyncload": _.template($('#waitasyncload').html()),
           "waitelement": _.template($('#waitelement').html()),
           "timeout": _.template($('#timeout').html()),
+          "promptresult": _.template($('#promptresult').html()),
+          "httpauth": _.template($('#httpauth').html()),
           "solverfailed": _.template($('#solverfailed').html())
           _MACRO_INSERT_TEMPLATES_
         }
@@ -4775,6 +4844,8 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
             "!/parseline": "parseline",
             "!/waitasyncload": "waitasyncload",
             "!/waitelement": "waitelement",
+            "!/promptresult": "promptresult",
+            "!/httpauth": "httpauth",
             "!/solverfailed": "solverfailed"
             _MACRO_INSERT_ROUTER_DEF_
         },
@@ -5097,6 +5168,12 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
         waitelement: function(){
                   _GobalModel.set({ state: "waitelement" });
                 },
+        promptresult: function(){
+                  _GobalModel.set({ state: "promptresult" });
+                },
+        httpauth: function(){
+                  _GobalModel.set({ state: "httpauth" });
+                },
         solverfailed: function(){
           _GobalModel.set({ state: "solverfailed" });
         }
@@ -5116,6 +5193,8 @@ <h4 class="modal-title tr" id="myModalLabel">Select Function</h4>
                 { name: tr("Javascript"), description: tr("Execute javascript"), ref: "javascript" },
                 { name: tr("Reset"), description: tr("Clear all browser data"), ref: "reset" },
                 { name: tr("Open File Result"), description: tr("Set open file dialog result"), ref: "openfile" },
+                { name: tr("Prompt Result"), description: tr("Set prompt result"), ref: "promptresult" },
+                { name: tr("Http Auth"), description: tr("Set http auth login and password"), ref: "httpauth" },
                 { name: tr("Scroll"), description: tr("Scroll to position"), ref: "scroll" },
                 { name: tr("Render"), description: tr("Render screen part to variable as png base64 encoded"), ref: "renderscreen" },
                 { name: tr("Solve Captcha"), description: tr("Solve captcha"), ref: "solvecaptcha" },
diff --git a/ChromeWorker/html/toolbox/style.css b/ChromeWorker/html/toolbox/style.css
index bd31b45..706518c 100644
--- a/ChromeWorker/html/toolbox/style.css
+++ b/ChromeWorker/html/toolbox/style.css
@@ -84,7 +84,7 @@ body
   margin: 5px auto !important;
 }
 
-.waitelement, .waitasyncload, .httpclientget, .httpclientdownload, .httpclientreset, .isloaded, .getstatus, .cachemaskallow,.cachemaskdeny,.cachemaskclear,.requestmaskallow,.requestmaskdeny,.requestmaskclear,.clearcache,.clearrequests, .html, .getcookiesforurl, .openfile, .reset, .moveelement,.moveandclickelement, .clickelement, .length, .set_attr, .attr, .set_random, .set_integer, .set, .focus, .check, .style, .exist, .clear, .load, .url, .xml, .log, .setvariable, .if, .while, .executefunction, .for, .sleep, .resize, .click, .move, .moveandclick, .break, .continue, .success, .fail, .text, .foreach
+.promptresult, .waitelement, .waitasyncload, .httpclientget, .httpclientdownload, .httpclientreset, .isloaded, .getstatus, .cachemaskallow,.cachemaskdeny,.cachemaskclear,.requestmaskallow,.requestmaskdeny,.requestmaskclear,.clearcache,.clearrequests, .html, .getcookiesforurl, .openfile, .reset, .moveelement,.moveandclickelement, .clickelement, .length, .set_attr, .attr, .set_random, .set_integer, .set, .focus, .check, .style, .exist, .clear, .load, .url, .xml, .log, .setvariable, .if, .while, .executefunction, .for, .sleep, .resize, .click, .move, .moveandclick, .break, .continue, .success, .fail, .text, .foreach
 {
   padding-top:35px;
 }
diff --git a/ChromeWorker/html/toolbox/translate.js b/ChromeWorker/html/toolbox/translate.js
index 11ff0cc..b0ff55e 100644
--- a/ChromeWorker/html/toolbox/translate.js
+++ b/ChromeWorker/html/toolbox/translate.js
@@ -1,6 +1,11 @@
 _L = 
 {
-	
+	"Prompt user input result": {"ru": "Результат ввода"},
+	"Http auth login": {"ru": "HTTP Аутентификация логин"},
+	"Http auth password": {"ru": "HTTP Аутентификация пароль"},
+	"Http Auth": {"ru": "HTTP Аутентификация"},
+	"Prompt Result": {"ru": "Окно \"prompt\""},
+
 	"STRING": {"ru": "СТРОКА"},
 	"INT": {"ru": "ЧИСЛО"},
 	"EXPRESSION": {"ru": "ВЫРАЖЕНИЕ"},
diff --git a/ChromeWorker/main.cpp b/ChromeWorker/main.cpp
index 7f16ef6..f115b57 100644
--- a/ChromeWorker/main.cpp
+++ b/ChromeWorker/main.cpp
@@ -840,6 +840,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     Parser->EventScroll.push_back(std::bind(&MainApp::ScrollCallback,app.get(),_1,_2));
     Parser->EventRender.push_back(std::bind(&MainApp::RenderCallback,app.get(),_1,_2,_3,_4));
     Parser->EventSetOpenFileName.push_back(std::bind(&MainApp::SetOpenFileNameCallback,app.get(),_1));
+    Parser->EventSetPromptResult.push_back(std::bind(&MainApp::SetPromptResultCallback,app.get(),_1));
+    Parser->EventSetHttpAuthResult.push_back(std::bind(&MainApp::SetHttpAuthResultCallback,app.get(),_1,_2));
     Parser->EventGetCookiesForUrl.push_back(std::bind(&MainApp::GetCookiesForUrlCallback,app.get(),_1));
     Parser->EventSaveCookies.push_back(std::bind(&MainApp::SaveCookiesCallback,app.get()));
     Parser->EventRestoreCookies.push_back(std::bind(&MainApp::RestoreCookiesCallback,app.get(),_1));
diff --git a/ChromeWorker/mainapp.cpp b/ChromeWorker/mainapp.cpp
index 88041a6..1787374 100644
--- a/ChromeWorker/mainapp.cpp
+++ b/ChromeWorker/mainapp.cpp
@@ -26,8 +26,7 @@ MainApp * App;
 
 MainApp::MainApp()
 {
-    DevToolsShown = false;
-    Browser = 0;
+    _HandlersManager = std::make_shared<HandlersManager>();
     IsLastCommandNull = true;
     TypeTextTaskIsActive = false;
     TypeTextIsFirstLetter = true;
@@ -65,15 +64,6 @@ BrowserData * MainApp::GetData()
     return Data;
 }
 
-CefRefPtr<CefBrowser> MainApp::GetBrowser()
-{
-    return Browser;
-}
-
-CefRefPtr<CefBrowser> MainApp::GetBrowserToolbox()
-{
-    return BrowserToolbox;
-}
 
 CefRefPtr<CefBrowserProcessHandler> MainApp::GetBrowserProcessHandler()
 {
@@ -88,16 +78,20 @@ CefRefPtr<CefRenderProcessHandler> MainApp::GetRenderProcessHandler()
 
 void MainApp::OnContextInitialized()
 {
-    handler = new MainHandler();
-    handler->SetSettings(Settings);
+    _HandlersManager->Init1(new MainHandler(),
+                            std::bind(&MainApp::SendTextResponce,this,_1),
+                            std::bind(&MainApp::UrlLoaded,this,_1,_2),
+                            std::bind(&MainApp::LoadSuccessCallback,this),
+                            std::bind(&MainApp::Paint,this,_1,_2,_3));
+
+    _HandlersManager->GetHandler()->SetSettings(Settings);
+    _HandlersManager->GetHandler()->SetData(Data);
+
     dhandler = new DevToolsHandler();
     dhandler->SetData(Data);
+    dhandler->SetLayout(Layout);
+    dhandler->SetHandlersManager(_HandlersManager.get());
     cookievisitor = new CookieVisitor();
-    handler->SetData(Data);
-    handler->EventSendTextResponce.push_back(std::bind(&MainApp::SendTextResponce,this,_1));
-    handler->EventLoadSuccess.push_back(std::bind(&MainApp::LoadSuccessCallback,this));
-    handler->EventUrlLoaded.push_back(std::bind(&MainApp::UrlLoaded,this,_1,_2));
-    handler->EventPaint.push_back(std::bind(&MainApp::Paint,this,_1,_2,_3));
 }
 
 void MainApp::Paint(char * data, int width, int height)
@@ -146,7 +140,7 @@ void MainApp::Paint(char * data, int width, int height)
             SendTextResponce(std::string("<Messages><Render>") + base64 + std::string("</Render></Messages>"));
         }
     }
-    if(handler->GetIsVisible())
+    if(_HandlersManager->GetHandler()->GetIsVisible() || _HandlersManager->GetHandler()->GetIsPopup())
     {
         ImageData.assign(data, data + width * height * 4);
         ImageWidth = width;
@@ -191,14 +185,14 @@ void MainApp::UrlLoaded(const std::string& url, int status)
 void MainApp::LoadCallback(const std::string& page)
 {
     IsWaitingForLoad = true;
-    if(!Browser)
+    if(!_HandlersManager->GetBrowser())
     {
         NextLoadPage = page;
         AfterReadyToCreateBrowser(true);
     }else
     {
         worker_log(std::string("LoadCallback use old ") + page);
-        CefRefPtr< CefFrame > Frame = Browser->GetMainFrame();
+        CefRefPtr< CefFrame > Frame = _HandlersManager->GetBrowser()->GetMainFrame();
         Frame->LoadURL(page);
     }
 }
@@ -215,11 +209,12 @@ void MainApp::ResetCallback()
 {
     worker_log("ResetCallback");
     Data->IsReset = true;
+    _HandlersManager->Reset();
 
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
         Data->IsAboutBlankLoaded = false;
-        CefRefPtr< CefFrame > Frame = Browser->GetMainFrame();
+        CefRefPtr< CefFrame > Frame = _HandlersManager->GetBrowser()->GetMainFrame();
         Frame->LoadURL("about:blank");
     }
     else
@@ -234,13 +229,6 @@ void MainApp::ResetCallbackFinalize()
     CefRefPtr<CefCookieManager> CookieManager = CefCookieManager::GetGlobalManager(NULL);
     CookieManager->DeleteCookies("","",0);
 
-    //Clear page content
-    /*if(Browser)
-    {
-        CefRefPtr< CefFrame > Frame = Browser->GetMainFrame();
-        Frame->LoadString("<html></html>","http://empty.com");
-    }*/
-
     {
         LOCK_BROWSER_DATA
 
@@ -263,10 +251,10 @@ void MainApp::ResetCallbackFinalize()
         Data->WidthBrowser = 1024;
         Data->HeightBrowser = 600;
     }
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        Browser->GetHost()->WasResized();
-        Browser->GetHost()->Invalidate(PET_VIEW);
+        _HandlersManager->GetBrowser()->GetHost()->WasResized();
+        _HandlersManager->GetBrowser()->GetHost()->Invalidate(PET_VIEW);
     }
 
     Layout->Update(Data->WidthBrowser,Data->HeightBrowser,Data->WidthAll,Data->HeightAll);
@@ -284,11 +272,30 @@ void MainApp::SetOpenFileNameCallback(const std::string& value)
     SendTextResponce("<Messages><SetOpenFileName>1</SetOpenFileName></Messages>");
 }
 
+void MainApp::SetPromptResultCallback(const std::string& value)
+{
+    {
+        LOCK_PROMPT
+        Data->_PromptResult = value;
+    }
+    SendTextResponce("<Messages><SetPromptResult>1</SetPromptResult></Messages>");
+}
+
+void MainApp::SetHttpAuthResultCallback(const std::string& login,const std::string& password)
+{
+    {
+        LOCK_HTTP_AUTH
+        Data->_HttpAuthLogin = login;
+        Data->_HttpAuthPassword = password;
+    }
+    SendTextResponce("<Messages><SetHttpAuthResult>1</SetHttpAuthResult></Messages>");
+}
+
 void MainApp::GetCookiesForUrlCallback(const std::string& value)
 {
     worker_log("GetCookiesForUrlCallback");
     std::string cookies;
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
         CefRefPtr<CefCookieManager> CookieManager = CefCookieManager::GetGlobalManager(NULL);
         CefCookie cookie = CookieVisitor::GetEmptyCookie();
@@ -320,7 +327,7 @@ void MainApp::SaveCookiesCallback()
 {
     worker_log("SaveCookiesCallback");
     std::string cookies;
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
         CefRefPtr<CefCookieManager> CookieManager = CefCookieManager::GetGlobalManager(NULL);
         CefCookie cookie = CookieVisitor::GetEmptyCookie();
@@ -371,10 +378,10 @@ void MainApp::RestoreCookiesCallback(const std::string& value)
 
 void MainApp::ResizeCallback(int width, int height)
 {
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        Browser->GetHost()->WasResized();
-        Browser->GetHost()->Invalidate(PET_VIEW);
+        _HandlersManager->GetBrowser()->GetHost()->WasResized();
+        _HandlersManager->GetBrowser()->GetHost()->Invalidate(PET_VIEW);
     }
     SendTextResponce("<Messages><Resize></Resize></Messages>");
 }
@@ -419,7 +426,7 @@ void MainApp::LoadSuccessCallback()
 {
     if(IsWaitingForLoad)
     {
-        BrowserEventsEmulator::SetFocus(Browser);
+        BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
         IsWaitingForLoad = false;
     }
 }
@@ -427,14 +434,14 @@ void MainApp::LoadSuccessCallback()
 void MainApp::MouseClickCallback(int x, int y)
 {
     worker_log("MouseClickCallback");
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        BrowserEventsEmulator::SetFocus(Browser);
+        BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
         LastCommand.CommandName = "_mouseclick";
         LastCommand.CommandParam1 = std::to_string(x);
         LastCommand.CommandParam2 = std::to_string(y);
         IsLastCommandNull = false;
-        Browser->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),Browser->GetMainFrame()->GetURL(), 0);
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
     }else
     {
         SendTextResponce("<Messages><MouseClick></MouseClick></Messages>");
@@ -444,9 +451,9 @@ void MainApp::MouseClickCallback(int x, int y)
 void MainApp::MouseMoveCallback(int x, int y)
 {
     worker_log(std::string("MouseMoveCallback<<") + std::to_string(x) + std::string("<<") + std::to_string(y));
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        BrowserEventsEmulator::SetFocus(Browser);
+        BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
         LastCommand.CommandName = "_mousemove";
         LastCommand.CommandParam1 = std::to_string(x);
         LastCommand.CommandParam2 = std::to_string(y);
@@ -455,7 +462,7 @@ void MainApp::MouseMoveCallback(int x, int y)
         MouseEndX = x;
         MouseEndY = y;
         IsLastCommandNull = false;
-        Browser->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),Browser->GetMainFrame()->GetURL(), 0);
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
 
 
     }else
@@ -467,14 +474,14 @@ void MainApp::MouseMoveCallback(int x, int y)
 void MainApp::ScrollCallback(int x, int y)
 {
     worker_log(std::string("ScrollCallback<<x<<") + std::to_string(x) + std::string("<<y<<") + std::to_string(y));
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        BrowserEventsEmulator::SetFocus(Browser);
+        BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
         LastCommand.CommandName = "_scroll";
         LastCommand.CommandParam1 = std::to_string(x);
         LastCommand.CommandParam2 = std::to_string(y);
         IsLastCommandNull = false;
-        Browser->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),Browser->GetMainFrame()->GetURL(), 0);
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
     }else
     {
         SendTextResponce("<Messages><Scroll></Scroll></Messages>");
@@ -484,9 +491,9 @@ void MainApp::ScrollCallback(int x, int y)
 void MainApp::RenderCallback(int x, int y, int width, int height)
 {
     worker_log(std::string("RenderCallback<<x<<") + std::to_string(x) + std::string("<<y<<") + std::to_string(y) + std::string("<<width<<") + std::to_string(width) + std::string("<<height<<") + std::to_string(height));
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        BrowserEventsEmulator::SetFocus(Browser);
+        BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
         LastCommand.CommandName = "_render";
         RenderX = x;
         RenderY = y;
@@ -494,7 +501,7 @@ void MainApp::RenderCallback(int x, int y, int width, int height)
         RenderHeight = height;
 
         IsLastCommandNull = false;
-        Browser->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x + width/2) + std::string(",") + std::to_string(y + width/2) + std::string(")"),Browser->GetMainFrame()->GetURL(), 0);
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_ScrollTo(") + std::to_string(x + width/2) + std::string(",") + std::to_string(y + width/2) + std::string(")"),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
     }else
     {
         SendTextResponce("<Messages><Render></Render></Messages>");
@@ -610,18 +617,19 @@ void MainApp::AfterReadyToCreateBrowser(bool Reload)
 
     //PrintDictionary(Context->GetAllPreferences(true),3);
 
-    if(Reload || !Browser)
+    if(Reload || !_HandlersManager->GetBrowser())
     {
         worker_log("!!!CREATENEWBROWSER!!!");
-        Browser = CefBrowserHost::CreateBrowserSync(window_info, handler, NextLoadPage, browser_settings, Context);
-        Layout->BrowserHandle = Browser->GetHost()->GetWindowHandle();
+        _HandlersManager->Init2(CefBrowserHost::CreateBrowserSync(window_info, _HandlersManager->GetHandler(), NextLoadPage, browser_settings, Context));
+
+        Layout->BrowserHandle = _HandlersManager->GetBrowser()->GetHost()->GetWindowHandle();
         //ToggleDevTools();
         CreateTooboxBrowser();
         CreateScenarioBrowser();
     }else
     {
         worker_log("!!!OPTIMIZEDRELOAD!!!");
-        Browser->GetMainFrame()->LoadURL(NextLoadPage);
+        _HandlersManager->GetBrowser()->GetMainFrame()->LoadURL(NextLoadPage);
     }
 }
 
@@ -629,48 +637,34 @@ void MainApp::VisibleCallback(bool visible)
 {
     worker_log(std::string("VisibleCallback ") + std::to_string(visible));
     if(visible)
-        handler->Show();
+        _HandlersManager->GetHandler()->Show();
     else
-        handler->Hide();
+        _HandlersManager->GetHandler()->Hide();
 }
 
 void MainApp::Hide()
 {
-    handler->Hide();
+    _HandlersManager->GetHandler()->Hide();
 }
 
 void MainApp::ToggleDevTools()
 {
     worker_log("ToggleDevTools");
-    if(DevToolsShown)
-        return;
-    if(!Browser)
+    if(!_HandlersManager->GetBrowser())
         return;
     if(!Data->IsRecord)
         return;
 
-    DevToolsShown = true;
-    CefWindowInfo window_info;
-
-    RECT rect = Layout->GetDevToolsRectangle(GetData()->WidthBrowser,GetData()->HeightBrowser,GetData()->WidthAll,GetData()->HeightAll);
-    window_info.SetAsChild(Data->_MainWindowHandle, rect);
-    CefBrowserSettings browser_settings;
-    Browser->GetHost()->ShowDevTools(window_info, dhandler, browser_settings, CefPoint(0,0));
+    dhandler->OpenDevTools();
 }
 
 void MainApp::InspectAt(int x, int y)
 {
     worker_log(std::string("Inspect At<<") + std::to_string(x) + std::string("<<") + std::to_string(y));
-    if(!Browser)
+    if(!_HandlersManager->GetBrowser())
         return;
 
-    RECT rect = Layout->GetDevToolsRectangle(GetData()->WidthBrowser,GetData()->HeightBrowser,GetData()->WidthAll,GetData()->HeightAll);
-    HWND HDevTools = Layout->GetDevToolsHandle();
-    if(HDevTools)
-    {
-        DestroyWindow(HDevTools);
-    }
-    dhandler->OpenNewDevTools(CefPoint(x,y),dhandler,Browser,rect);
+    dhandler->OpenDevTools(CefPoint(x,y));
 }
 
 void MainApp::MouseMoveAt(int x, int y)
@@ -680,8 +674,8 @@ void MainApp::MouseMoveAt(int x, int y)
         return;
 
     LastMouseTrack = CurrentTime;
-    if(Browser)
-        Browser->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_InspectElement(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),Browser->GetMainFrame()->GetURL(), 0);
+    if(_HandlersManager->GetBrowser())
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(std::string("BrowserAutomationStudio_InspectElement(") + std::to_string(x) + std::string(",") + std::to_string(y) + std::string(")"),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
     }
 
 void MainApp::MouseLeave()
@@ -751,9 +745,9 @@ void MainApp::GetUrlCallback()
 {
     std::string url;
 
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
-        url = Browser->GetMainFrame()->GetURL();
+        url = _HandlersManager->GetBrowser()->GetMainFrame()->GetURL();
     }
     xml_encode(url);
     SendTextResponce(std::string("<Messages><GetUrl>") + url + std::string("</GetUrl></Messages>"));
@@ -768,10 +762,10 @@ void MainApp::OnBeforeCommandLineProcessing(const CefString& process_type,CefRef
 
 bool MainApp::IsNeedQuit()
 {
-    if(!handler)
+    if(!_HandlersManager->GetHandler())
         return false;
 
-    return handler->IsNeedQuit();
+    return _HandlersManager->GetHandler()->IsNeedQuit();
 }
 
 void MainApp::SendTextResponce(const std::string& text)
@@ -899,7 +893,7 @@ void MainApp::ClearDataCallback()
 }
 void MainApp::WaitCodeCallback()
 {
-    if(!Browser)
+    if(!_HandlersManager->GetBrowser())
     {
         NextLoadPage = "about:blank";
         AfterReadyToCreateBrowser(true);
@@ -915,7 +909,7 @@ void MainApp::WaitCodeCallback()
 
 void MainApp::StartSectionCallback(int Id)
 {
-    if(!Browser)
+    if(!_HandlersManager->GetBrowser())
     {
         NextLoadPage = "about:blank";
         AfterReadyToCreateBrowser(true);
@@ -1039,7 +1033,7 @@ void MainApp::ElementCommandCallback(const ElementCommand &Command)
     worker_log(std::string("ElementCommandCallback<<"));
     LastCommand = Command;
     IsLastCommandNull = false;
-    if(Browser)
+    if(_HandlersManager->GetBrowser())
     {
         std::string script;
         if(Command.CommandName == "xml")
@@ -1054,7 +1048,7 @@ void MainApp::ElementCommandCallback(const ElementCommand &Command)
             script = std::string("{var self = BrowserAutomationStudio_FindElement(") + LastCommand.SerializePath() + std::string(");var obj=null;try{obj = eval(") + script_escaped + std::string(");}catch(e){}var res='';if(typeof(obj)!='undefined'&&obj !== null){res=obj.toString()}browser_automation_studio_result(res);}");
         }else if(Command.CommandName == "click")
         {
-            BrowserEventsEmulator::SetFocus(Browser);
+            BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
             script = std::string("{var el = BrowserAutomationStudio_FindElement(") + LastCommand.SerializePath() + std::string(");if(el)el.click();browser_automation_studio_result('');}");
         }else if(Command.CommandName == "system_click" || Command.CommandName == "check" || Command.CommandName == "focus")
         {
@@ -1071,12 +1065,12 @@ void MainApp::ElementCommandCallback(const ElementCommand &Command)
             script = std::string("{var el = BrowserAutomationStudio_FindElement(") + LastCommand.SerializePath() + std::string(");if(el){var rect = el.getBoundingClientRect();BrowserAutomationStudio_ScrollToRelative(rect.left + rect.width/2,rect.top + rect.height/2);}else browser_automation_studio_result('');}");
         }else if(Command.CommandName == "fill")
         {
-            BrowserEventsEmulator::SetFocus(Browser);
+            BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
             std::string text_escaped = picojson::value(LastCommand.CommandParam1).serialize();
             script = std::string("{var el = BrowserAutomationStudio_FindElement(") + LastCommand.SerializePath() + std::string(");if(el){el.value = ") + text_escaped + std::string("};browser_automation_studio_result('');}");
         }else if(Command.CommandName == "type")
         {
-            BrowserEventsEmulator::SetFocus(Browser);
+            BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
             TypeText = LastCommand.CommandParam1;
             TypeTextDelay = std::stoi(LastCommand.CommandParam2);
             if(LastCommand.Path.size()>0)
@@ -1092,7 +1086,7 @@ void MainApp::ElementCommandCallback(const ElementCommand &Command)
             }
         }else if(Command.CommandName == "clear")
         {
-            BrowserEventsEmulator::SetFocus(Browser);
+            BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
             TypeText = "<CONTROL>a<DELETE>";
             TypeTextDelay = 100;
             if(LastCommand.Path.size()>0)
@@ -1181,19 +1175,19 @@ void MainApp::ElementCommandCallback(const ElementCommand &Command)
         {
             worker_log(std::string("EXEC<<") + script);
             if(Command.FrameId.empty())
-                Browser->GetMainFrame()->ExecuteJavaScript(script.c_str(),Browser->GetMainFrame()->GetURL(), 0);
+                _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(script.c_str(),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
             else
             {
                 std::vector<int64> identifiers;
-                Browser->GetFrameIdentifiers(identifiers);
+                _HandlersManager->GetBrowser()->GetFrameIdentifiers(identifiers);
 
                 bool done = false;
                 for(int64 id:identifiers)
                 {
-                    if(match(Command.FrameId,Browser->GetFrame(id)->GetURL().ToString()))
+                    if(match(Command.FrameId,_HandlersManager->GetBrowser()->GetFrame(id)->GetURL().ToString()))
                     {
-                        worker_log(std::string("ExecutingInFrame<<") + Browser->GetFrame(id)->GetURL().ToString());
-                        Browser->GetFrame(id)->ExecuteJavaScript(script.c_str(),Browser->GetFrame(id)->GetURL(), 0);
+                        worker_log(std::string("ExecutingInFrame<<") + _HandlersManager->GetBrowser()->GetFrame(id)->GetURL().ToString());
+                        _HandlersManager->GetBrowser()->GetFrame(id)->ExecuteJavaScript(script.c_str(),_HandlersManager->GetBrowser()->GetFrame(id)->GetURL(), 0);
                         done = true;
                         break;
                     }
@@ -1234,10 +1228,12 @@ void MainApp::Timer()
     if(dhandler)
         dhandler->Timer();
 
-    if(handler)
+    _HandlersManager->Timer();
+
+    if(_HandlersManager->GetHandler())
     {
-        CefPostTask(TID_IO, base::Bind(&MainHandler::CleanResourceHandlerList, handler.get()));
-        if(handler->GetResourceListLength() == 0 && Data->IsReset && Data->IsAboutBlankLoaded)
+        //CefPostTask(TID_IO, base::Bind(&MainHandler::CleanResourceHandlerList, _HandlersManager->GetHandler()));
+        if(_HandlersManager->GetHandler()->GetResourceListLength() == 0 && Data->IsReset && Data->IsAboutBlankLoaded)
         {
             ResetCallbackFinalize();
         }
@@ -1452,8 +1448,8 @@ void MainApp::HandleMainBrowserEvents()
             }else
             {
                 v8handler->SetResultProcessed();
-                BrowserEventsEmulator::SetFocus(Browser);
-                BrowserEventsEmulator::MouseClick(Browser,x,y,GetScrollPosition());
+                BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
+                BrowserEventsEmulator::MouseClick(_HandlersManager->GetBrowser(),x,y,GetScrollPosition());
                 SendTextResponce("<Messages><MouseClick></MouseClick></Messages>");
                 worker_log(std::string("EVENTFLAG_LEFT_MOUSE_BUTTON>>"));
             }
@@ -1476,7 +1472,7 @@ void MainApp::HandleMainBrowserEvents()
             }else
             {
                 v8handler->SetResultProcessed();
-                BrowserEventsEmulator::SetFocus(Browser);
+                BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
                 IsMouseMoveSimulation = true;
             }
         }else if(LastCommand.CommandName == std::string("_scroll"))
@@ -1525,8 +1521,8 @@ void MainApp::HandleMainBrowserEvents()
                 RenderY = RenderY - Data->ScrollY;
                 IsElementRender = false;
                 NeedRenderNextFrame = true;
-                if(Browser)
-                    Browser->GetHost()->Invalidate(PET_VIEW);
+                if(_HandlersManager->GetBrowser())
+                    _HandlersManager->GetBrowser()->GetHost()->Invalidate(PET_VIEW);
             }
 
 
@@ -1550,10 +1546,10 @@ void MainApp::HandleMainBrowserEvents()
                 v8handler->SetResultProcessed();
                 worker_log(std::string("system_click>>") + std::to_string(x) + std::string(">>") + std::to_string(y));
 
-                BrowserEventsEmulator::SetFocus(Browser);
+                BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
                 if(LastCommand.CommandName != std::string("focus"))
                 {
-                    BrowserEventsEmulator::MouseClick(Browser,x,y,GetScrollPosition());
+                    BrowserEventsEmulator::MouseClick(_HandlersManager->GetBrowser(),x,y,GetScrollPosition());
                 }
                 FinishedLastCommand("");
             }
@@ -1621,8 +1617,8 @@ void MainApp::HandleMainBrowserEvents()
                 RenderHeight = bottom - top;
                 IsElementRender = true;
                 NeedRenderNextFrame = true;
-                if(Browser)
-                    Browser->GetHost()->Invalidate(PET_VIEW);
+                if(_HandlersManager->GetBrowser())
+                    _HandlersManager->GetBrowser()->GetHost()->Invalidate(PET_VIEW);
             }
         }else if(LastCommand.CommandName == std::string("move"))
         {
@@ -1643,7 +1639,7 @@ void MainApp::HandleMainBrowserEvents()
             {
                 v8handler->SetResultProcessed();
                 worker_log(std::string("move>>") + std::to_string(x) + std::string(">>") + std::to_string(y));
-                BrowserEventsEmulator::SetFocus(Browser);
+                BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
                 LastCommand.CommandName = "move";
                 LastCommand.CommandParam1 = std::to_string(x);
                 LastCommand.CommandParam2 = std::to_string(y);
@@ -1666,7 +1662,7 @@ void MainApp::HandleMainBrowserEvents()
                 FinishedLastCommand("");
             }else
             {
-                BrowserEventsEmulator::SetFocus(Browser);
+                BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
                 std::size_t pos = res.first.find(",");
                 int x = -1, y = -1;
                 if(pos != std::string::npos)
@@ -1693,7 +1689,7 @@ void MainApp::HandleMainBrowserEvents()
         }else if(LastCommand.CommandName == std::string("set") && LastCommand.StageId == 0 || LastCommand.CommandName == std::string("set_integer") && LastCommand.StageId == 0 || LastCommand.CommandName == std::string("set_random") && LastCommand.StageId == 0)
         {
             v8handler->SetResultProcessed();
-            BrowserEventsEmulator::SetFocus(Browser);
+            BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
             TypeText = res.first;
             TypeTextDelay = 30;
             LastCommand.StageId = 1;
@@ -1701,7 +1697,7 @@ void MainApp::HandleMainBrowserEvents()
             if(!script.empty())
             {
                 worker_log(std::string("EXEC<<") + script);
-                Browser->GetMainFrame()->ExecuteJavaScript(script.c_str(),Browser->GetMainFrame()->GetURL(), 0);
+                _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript(script.c_str(),_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
             }
             IsLastCommandNull = false;
         }
@@ -1747,12 +1743,12 @@ void MainApp::ExecuteMouseMove()
 {
     if(!IsMouseMoveSimulation)
         return;
-    if(!Browser)
+    if(!_HandlersManager->GetBrowser())
         return;
 
     int CursorX = Data->CursorX;
     int CursorY = Data->CursorY;
-    BrowserEventsEmulator::MouseMove(Browser, IsMouseMoveSimulation, MouseStartX, MouseStartY, MouseEndX, MouseEndY , CursorX, CursorY, Speed, Data->ScrollX, Data->ScrollY, Data->WidthBrowser, Data->HeightBrowser);
+    BrowserEventsEmulator::MouseMove(_HandlersManager->GetBrowser(), IsMouseMoveSimulation, MouseStartX, MouseStartY, MouseEndX, MouseEndY , CursorX, CursorY, Speed, Data->ScrollX, Data->ScrollY, Data->WidthBrowser, Data->HeightBrowser);
     Data->CursorX = CursorX;
     Data->CursorY = CursorY;
 
@@ -1779,15 +1775,15 @@ void MainApp::ExecuteTypeText()
 
     if(TypeTextIsFirstLetter)
     {
-        BrowserEventsEmulator::SetFocus(Browser);
-        BrowserEventsEmulator::MouseClick(Browser,TypeTextX,TypeTextY,GetScrollPosition());
+        BrowserEventsEmulator::SetFocus(_HandlersManager->GetBrowser());
+        BrowserEventsEmulator::MouseClick(_HandlersManager->GetBrowser(),TypeTextX,TypeTextY,GetScrollPosition());
         worker_log(std::string("TypeTextIsFirstLetter<<") + std::to_string(TypeTextX) + std::string("<<") + std::to_string(TypeTextY));
         TypeTextIsFirstLetter = false;
         return;
     }
 
     //Print letter
-    BrowserEventsEmulator::Key(Browser,TypeText,TypeTextState);
+    BrowserEventsEmulator::Key(_HandlersManager->GetBrowser(),TypeText,TypeTextState);
 
     if(TypeText.length() == 0 && TypeTextState.IsClear())
     {
@@ -1801,15 +1797,53 @@ void MainApp::OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame
     /*if(!frame->IsMain())
         return;*/
 
+
+
+    //Toolbox Browser
+    if(BrowserToolbox.get() && BrowserToolbox->GetIdentifier() == browser->GetIdentifier())
+    {
+        worker_log("OnContextCreated<<ToolboxBrowser");
+        if(frame->IsMain())
+            toolboxv8handler = new ToolboxV8Handler();
+        CefRefPtr<CefV8Value> object = context->GetGlobal();
+        object->SetValue("BrowserAutomationStudio_Append", CefV8Value::CreateFunction("BrowserAutomationStudio_Append", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_Initialized", CefV8Value::CreateFunction("BrowserAutomationStudio_Initialized", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_EditCancel", CefV8Value::CreateFunction("BrowserAutomationStudio_EditCancel", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_Maximize", CefV8Value::CreateFunction("BrowserAutomationStudio_Maximize", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_Minimize", CefV8Value::CreateFunction("BrowserAutomationStudio_Minimize", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("_K", CefV8Value::CreateString(Lang), V8_PROPERTY_ATTRIBUTE_NONE);
+        return;
+    }
+
+    //Scenario Browser
+    if(BrowserScenario.get() && BrowserScenario->GetIdentifier() == browser->GetIdentifier())
+    {
+        worker_log("OnContextCreated<<BrowserScenario");
+        CefRefPtr<CefV8Value> object = context->GetGlobal();
+        if(frame->IsMain())
+            scenariov8handler = new ScenarioV8Handler();
+        object->SetValue("BrowserAutomationStudio_SendCode", CefV8Value::CreateFunction("BrowserAutomationStudio_SendCode", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_Initialized", CefV8Value::CreateFunction("BrowserAutomationStudio_Initialized", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_Execute", CefV8Value::CreateFunction("BrowserAutomationStudio_Execute", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_Restart", CefV8Value::CreateFunction("BrowserAutomationStudio_Restart", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_EditStart", CefV8Value::CreateFunction("BrowserAutomationStudio_EditStart", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("BrowserAutomationStudio_EditEnd", CefV8Value::CreateFunction("BrowserAutomationStudio_EditEnd", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
+        object->SetValue("_K", CefV8Value::CreateString(Lang), V8_PROPERTY_ATTRIBUTE_NONE);
+        return;
+    }
+
+
     //Main Browser
-    if(Browser.get() && Browser->GetIdentifier() == browser->GetIdentifier())
+    //if(_HandlersManager->GetBrowser() && _HandlersManager->GetBrowser()->GetIdentifier() == browser->GetIdentifier())
     {
-        worker_log("OnContextCreated<<MainBrowser");
+        worker_log(std::string("OnContextCreated<<MainBrowser<<") + std::to_string(browser->GetIdentifier()) + "<<" + std::to_string(frame->IsMain()));
         CefRefPtr<CefV8Value> object = context->GetGlobal();
 
+        _HandlersManager->NewContextCreated(browser->GetIdentifier());
+
         {
             LOCK_V8_HANDLER
-            if(frame->IsMain())
+            if(!v8handler)
                 v8handler = new V8Handler();
             object->SetValue("browser_automation_studio_result", CefV8Value::CreateFunction("browser_automation_studio_result", v8handler), V8_PROPERTY_ATTRIBUTE_NONE);
             object->SetValue("browser_automation_studio_inspect_result", CefV8Value::CreateFunction("browser_automation_studio_inspect_result", v8handler), V8_PROPERTY_ATTRIBUTE_NONE);
@@ -1837,37 +1871,6 @@ void MainApp::OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame
         Data->ScrollX = 0;
         Data->ScrollY = 0;
     }
-
-    //Toolbox Browser
-    if(BrowserToolbox.get() && BrowserToolbox->GetIdentifier() == browser->GetIdentifier())
-    {
-        worker_log("OnContextCreated<<ToolboxBrowser");
-        if(frame->IsMain())
-            toolboxv8handler = new ToolboxV8Handler();
-        CefRefPtr<CefV8Value> object = context->GetGlobal();
-        object->SetValue("BrowserAutomationStudio_Append", CefV8Value::CreateFunction("BrowserAutomationStudio_Append", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_Initialized", CefV8Value::CreateFunction("BrowserAutomationStudio_Initialized", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_EditCancel", CefV8Value::CreateFunction("BrowserAutomationStudio_EditCancel", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_Maximize", CefV8Value::CreateFunction("BrowserAutomationStudio_Maximize", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_Minimize", CefV8Value::CreateFunction("BrowserAutomationStudio_Minimize", toolboxv8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("_K", CefV8Value::CreateString(Lang), V8_PROPERTY_ATTRIBUTE_NONE);
-    }
-
-    //Scenario Browser
-    if(BrowserScenario.get() && BrowserScenario->GetIdentifier() == browser->GetIdentifier())
-    {
-        worker_log("OnContextCreated<<BrowserScenario");
-        CefRefPtr<CefV8Value> object = context->GetGlobal();
-        if(frame->IsMain())
-            scenariov8handler = new ScenarioV8Handler();
-        object->SetValue("BrowserAutomationStudio_SendCode", CefV8Value::CreateFunction("BrowserAutomationStudio_SendCode", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_Initialized", CefV8Value::CreateFunction("BrowserAutomationStudio_Initialized", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_Execute", CefV8Value::CreateFunction("BrowserAutomationStudio_Execute", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_Restart", CefV8Value::CreateFunction("BrowserAutomationStudio_Restart", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_EditStart", CefV8Value::CreateFunction("BrowserAutomationStudio_EditStart", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("BrowserAutomationStudio_EditEnd", CefV8Value::CreateFunction("BrowserAutomationStudio_EditEnd", scenariov8handler), V8_PROPERTY_ATTRIBUTE_NONE);
-        object->SetValue("_K", CefV8Value::CreateString(Lang), V8_PROPERTY_ATTRIBUTE_NONE);
-    }
 }
 
 void MainApp::OnWebKitInitialized()
@@ -1881,23 +1884,23 @@ void MainApp::OnWebKitInitialized()
 
 void MainApp::ScrollUp()
 {
-    if(Browser)
-        Browser->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollUp()",Browser->GetMainFrame()->GetURL(), 0);
+    if(_HandlersManager->GetBrowser())
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollUp()",_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
 }
 void MainApp::ScrollDown()
 {
-    if(Browser)
-        Browser->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollDown()",Browser->GetMainFrame()->GetURL(), 0);
+    if(_HandlersManager->GetBrowser())
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollDown()",_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
 }
 void MainApp::ScrollLeft()
 {
-    if(Browser)
-        Browser->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollLeft()",Browser->GetMainFrame()->GetURL(), 0);
+    if(_HandlersManager->GetBrowser())
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollLeft()",_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
 }
 void MainApp::ScrollRight()
 {
-    if(Browser)
-        Browser->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollRight()",Browser->GetMainFrame()->GetURL(), 0);
+    if(_HandlersManager->GetBrowser())
+        _HandlersManager->GetBrowser()->GetMainFrame()->ExecuteJavaScript("BrowserAutomationStudio_ScrollRight()",_HandlersManager->GetBrowser()->GetMainFrame()->GetURL(), 0);
 }
 
 void MainApp::EmulateClick(int x, int y)
diff --git a/ChromeWorker/mainapp.h b/ChromeWorker/mainapp.h
index 8fe6276..4c54325 100644
--- a/ChromeWorker/mainapp.h
+++ b/ChromeWorker/mainapp.h
@@ -19,14 +19,15 @@
 #include "extract_functions.h"
 #include "extract_resources.h"
 #include "settings.h"
+#include "handlersmanager.h"
+
 
 class MainApp: public CefApp, public CefBrowserProcessHandler, public CefRenderProcessHandler
 {
-    CefRefPtr<MainHandler> handler;
+    std::shared_ptr<HandlersManager> _HandlersManager;
+
     CefRefPtr<ToolboxHandler> thandler;
     CefRefPtr<ScenarioHandler> shandler;
-
-    CefRefPtr<CefBrowser> Browser;
     CefRefPtr<CefBrowser> BrowserToolbox;
     CefRefPtr<CefBrowser> BrowserScenario;
     CefRefPtr<DevToolsHandler> dhandler;
@@ -94,9 +95,6 @@ class MainApp: public CefApp, public CefBrowserProcessHandler, public CefRenderP
 
     std::string Lang;
 
-    bool DevToolsShown;
-
-
 public:
     MainApp();
     void ForceUpdateWindowPositionWithParent();
@@ -105,8 +103,6 @@ class MainApp: public CefApp, public CefBrowserProcessHandler, public CefRenderP
     void SetSettings(settings *Settings);
     void SetLayout(MainLayout *Layout);
     BrowserData * GetData();
-    CefRefPtr<CefBrowser> GetBrowser();
-    CefRefPtr<CefBrowser> GetBrowserToolbox();
 
     virtual CefRefPtr<CefBrowserProcessHandler> GetBrowserProcessHandler() OVERRIDE;
     virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() OVERRIDE;
@@ -130,6 +126,8 @@ class MainApp: public CefApp, public CefBrowserProcessHandler, public CefRenderP
     void GetUrlCallback();
     void SetUserAgentCallback(const std::string& value);
     void SetOpenFileNameCallback(const std::string& value);
+    void SetPromptResultCallback(const std::string& value);
+    void SetHttpAuthResultCallback(const std::string& login,const std::string& password);
     void GetCookiesForUrlCallback(const std::string& value);
     void SaveCookiesCallback();
     void RestoreCookiesCallback(const std::string& value);
diff --git a/ChromeWorker/mainhandler.cpp b/ChromeWorker/mainhandler.cpp
index fe32f9a..2f665b4 100644
--- a/ChromeWorker/mainhandler.cpp
+++ b/ChromeWorker/mainhandler.cpp
@@ -3,7 +3,6 @@
 #include "include/cef_app.h"
 #include "include/wrapper/cef_closure_task.h"
 #include "include/wrapper/cef_helpers.h"
-#include "log.h"
 #include "match.h"
 #include "multithreading.h"
 
@@ -11,10 +10,20 @@ using namespace std::placeholders;
 
 MainHandler::MainHandler()
 {
+    worker_log(std::string("MainHandlerCreaate<<") + std::to_string((int)this));
+
     NeedQuit = false;
     WaitForLoadEvent = false;
     Browser = 0;
     IsVisible = false;
+    IsPopup = false;
+}
+
+int MainHandler::GetBrowserId()
+{
+    if(!Browser)
+        return -1;
+    return Browser->GetIdentifier();
 }
 
 
@@ -28,6 +37,16 @@ void MainHandler::SetSettings(settings *Settings)
     this->Settings = Settings;
 }
 
+void MainHandler::SetIsPopup()
+{
+    this->IsPopup = true;
+}
+
+bool MainHandler::GetIsPopup()
+{
+    return IsPopup;
+}
+
 
 CefRefPtr<CefDisplayHandler> MainHandler::GetDisplayHandler()
 {
@@ -71,8 +90,35 @@ CefRefPtr<CefJSDialogHandler> MainHandler::GetJSDialogHandler()
 
 bool MainHandler::OnJSDialog(CefRefPtr<CefBrowser> browser, const CefString& origin_url, const CefString& accept_lang, JSDialogType dialog_type, const CefString& message_text, const CefString& default_prompt_text, CefRefPtr<CefJSDialogCallback> callback, bool& suppress_message)
 {
-    suppress_message = true;
-    return false;
+    switch(dialog_type)
+    {
+        case JSDIALOGTYPE_PROMPT:
+        {
+            std::string res;
+            {
+                LOCK_PROMPT
+                res = Data->_PromptResult;
+            }
+            worker_log(std::string("Prompt<<") + res);
+            suppress_message = false;
+            callback->Continue(true,res);
+            return true;
+
+        }break;
+        case JSDIALOGTYPE_CONFIRM:
+        {
+            suppress_message = false;
+            callback->Continue(true,"");
+            return true;
+
+        }break;
+        case JSDIALOGTYPE_ALERT:
+        {
+            suppress_message = true;
+            return false;
+
+        }break;
+    }
 }
 
 bool MainHandler::OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser,const CefString& message_text, bool is_reload, CefRefPtr<CefJSDialogCallback> callback)
@@ -173,6 +219,14 @@ void MainHandler::OnAfterCreated(CefRefPtr<CefBrowser> browser)
 
     this->Browser = browser;
 
+    if(IsPopup)
+    {
+        Browser->GetHost()->WasResized();
+        auto EventPopupCreatedCopy = EventPopupCreated;
+        for(auto f: EventPopupCreatedCopy)
+            f(this,browser);
+    }
+
     if(IsVisible)
         Show();
 }
@@ -211,19 +265,49 @@ bool MainHandler::DoClose(CefRefPtr<CefBrowser> browser)
 
 void MainHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser)
 {
-    Browser = 0;
     worker_log("OnBeforeClose");
 
-    for(auto f:EventClosedProgrammatically)
-        f();
+
+    if(IsPopup)
+    {
+        auto EventPopupClosedCopy = EventPopupClosed;
+        for(auto f: EventPopupClosedCopy)
+            f(GetBrowserId());
+    }
+    Browser = 0;
 }
 
 bool MainHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, const CefString& target_url, const CefString& target_frame_name, CefLifeSpanHandler::WindowOpenDisposition target_disposition, bool user_gesture, const CefPopupFeatures& popupFeatures, CefWindowInfo& windowInfo, CefRefPtr<CefClient>& client, CefBrowserSettings& settings, bool* no_javascript_access)
 {
     worker_log(std::string("OnBeforePopup<<") + target_url.ToString());
-    frame->LoadURL(target_url);
-    worker_log(std::string("OnBeforePopup>>"));
-    return true;
+
+
+    bool Accept = true;
+    std::string url = target_url.ToString();
+    {
+        LOCK_BROWSER_DATA
+        for(std::pair<bool, std::string> p:Data->_RequestMask)
+        {
+            if(match(p.second,url))
+            {
+                Accept = p.first;
+            }
+        }
+    }
+
+    if(Accept)
+    {
+        windowInfo.SetAsWindowless(0,true);
+        settings.windowless_frame_rate = 5;
+        MainHandler * h = new MainHandler();
+        h->SetSettings(Settings);
+        h->SetData(Data);
+        h->SetIsPopup();
+        h->EventPopupCreated = EventPopupCreated;
+        client = h;
+    }
+
+    return !Accept;
 }
 
 CefRequestHandler::ReturnValue MainHandler::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefRequestCallback> callback)
@@ -282,7 +366,7 @@ CefRequestHandler::ReturnValue MainHandler::OnBeforeResourceLoad(CefRefPtr<CefBr
 void MainHandler::OnResourceLoadComplete(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, CefRefPtr<CefResponse> response, CefRequestHandler::URLRequestStatus status, int64 received_content_length)
 {
     for(auto f:EventUrlLoaded)
-        f(request->GetURL().ToString(),response->GetStatus());
+        f(request->GetURL().ToString(),response->GetStatus(),GetBrowserId());
 }
 
 
@@ -314,10 +398,10 @@ void MainHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> f
     {
         if(httpStatusCode >= 200 && httpStatusCode < 300)
         {
-           browser->GetMainFrame()->ExecuteJavaScript("if(document.body.style['background-color'].length === 0)document.body.style['background-color']='white';", Browser->GetMainFrame()->GetURL(), 0);
+           browser->GetMainFrame()->ExecuteJavaScript("if(document.body.style['background-color'].length === 0)document.body.style['background-color']='white';", browser->GetMainFrame()->GetURL(), 0);
            SendTextResponce("<Messages><Load>0</Load></Messages>");
            for(auto f:EventLoadSuccess)
-               f();
+               f(GetBrowserId());
         }else
         {
             SendTextResponce("<Messages><Load>1</Load></Messages>");
@@ -334,7 +418,7 @@ void MainHandler::OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame>
 void MainHandler::SendTextResponce(const std::string& text)
 {
     for(auto f:EventSendTextResponce)
-        f(text);
+        f(text,GetBrowserId());
 }
 
 bool MainHandler::IsNeedQuit()
@@ -366,8 +450,7 @@ void MainHandler::OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
     if(type == PET_VIEW)
     {
         for(auto f:EventPaint)
-            f((char*)buffer, width, height);
-        //worker_log(std::string("OnPaint<<") + std::to_string(width) + std::string("<<") + std::to_string(height) + std::string("<<"));
+            f((char*)buffer, width, height, GetBrowserId());
     }
 }
 
diff --git a/ChromeWorker/mainhandler.h b/ChromeWorker/mainhandler.h
index 4be3c70..be9f2ad 100644
--- a/ChromeWorker/mainhandler.h
+++ b/ChromeWorker/mainhandler.h
@@ -8,22 +8,30 @@
 #include "curlresourcehandler.h"
 #include <atomic>
 #include "settings.h"
+#include "log.h"
+#include "refcountpublic.h"
+
 
 
 class MainHandler : public CefClient, public CefDisplayHandler, public CefLifeSpanHandler, public CefLoadHandler, public CefRequestHandler, public CefDialogHandler, public CefKeyboardHandler, public CefRenderHandler, public CefJSDialogHandler
 {
     bool NeedQuit;
     bool WaitForLoadEvent;
+    bool IsPopup;
     CefRefPtr<CefBrowser> Browser;
     bool IsVisible;
     BrowserData * Data;
     settings * Settings;
 
+    int GetBrowserId();
+
 public:
     MainHandler();
     bool GetIsVisible();
     void SetData(BrowserData *Data);
     void SetSettings(settings *Settings);
+    void SetIsPopup();
+    bool GetIsPopup();
 
     virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE;
     virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE;
@@ -81,18 +89,20 @@ class MainHandler : public CefClient, public CefDisplayHandler, public CefLifeSp
     int GetResourceListLength();
 
     //Events
-    std::vector<std::function<void(const std::string&)> > EventSendTextResponce;
-    std::vector<std::function<void(const std::string&, int)> > EventUrlLoaded;
-    std::vector<std::function<void()> > EventClosedProgrammatically;
-    std::vector<std::function<void()> > EventLoadSuccess;
-    std::vector<std::function<void(char*,int,int)> > EventPaint;
+    std::vector<std::function<void(const std::string&, int)> > EventSendTextResponce;
+    std::vector<std::function<void(const std::string&, int, int)> > EventUrlLoaded;
+    std::vector<std::function<void(int)> > EventLoadSuccess;
+    std::vector<std::function<void(char*,int,int,int)> > EventPaint;
+    std::vector<std::function<void(CefRefPtr<MainHandler>,CefRefPtr<CefBrowser>)> > EventPopupCreated;
+    std::vector<std::function<void(int)> > EventPopupClosed;
     std::vector<CefRefPtr<CurlResourceHandler> > EventOnTimerCurlResources;
     std::atomic_int CurlResourcesLength;
 
 private:
     void SendTextResponce(const std::string&);
-    IMPLEMENT_REFCOUNTING(MainHandler);
 
+private:
+    IMPLEMENT_REFCOUNTING_NONE();
 };
 
 #endif // MAINHANDLER_H
diff --git a/ChromeWorker/multithreading.h b/ChromeWorker/multithreading.h
index c9d26a6..c407c66 100644
--- a/ChromeWorker/multithreading.h
+++ b/ChromeWorker/multithreading.h
@@ -8,13 +8,17 @@ struct multithreading
 {
     base::Lock _LockBrowserData;
     base::Lock _LockV8Handler;
+    base::Lock _LockNewContextList;
+    base::Lock _LockPrompt;
+    base::Lock _LockHttpAuth;
 };
 extern multithreading mthreading;
 
 #define LOCK_BROWSER_DATA base::AutoLock lock_scope(mthreading._LockBrowserData);
 #define LOCK_V8_HANDLER base::AutoLock lock_scope(mthreading._LockV8Handler);
-
-
+#define LOCK_CONTEXT_LIST base::AutoLock lock_scope(mthreading._LockNewContextList);
+#define LOCK_PROMPT base::AutoLock lock_scope(mthreading._LockPrompt);
+#define LOCK_HTTP_AUTH base::AutoLock lock_scope(mthreading._LockHttpAuth);
 
 std::string GetCurrentThreadString();
 
diff --git a/ChromeWorker/refcountpublic.h b/ChromeWorker/refcountpublic.h
index 185e052..408a8ab 100644
--- a/ChromeWorker/refcountpublic.h
+++ b/ChromeWorker/refcountpublic.h
@@ -58,4 +58,22 @@ class CefRefCountPublic {
     CefRefCountPublic ref_count_;
 
 
+#define IMPLEMENT_REFCOUNTING_NONE()                \
+  public:                                           \
+    void AddRef() const OVERRIDE {                  \
+      ref_count_.AddRef();                          \
+    }                                               \
+    bool Release() const OVERRIDE {                 \
+      if (ref_count_.Release()) {                   \
+        return true;                                \
+      }                                             \
+      return false;                                 \
+    }                                               \
+    bool HasOneRef() const OVERRIDE {               \
+      return ref_count_.HasOneRef();                \
+    }                                               \
+    CefRefCountPublic ref_count_;
+
+
+
 #endif // REFCOUNTPUBLIC_H
diff --git a/Engine/ibrowser.h b/Engine/ibrowser.h
index 2c34ded..fd2c1c2 100644
--- a/Engine/ibrowser.h
+++ b/Engine/ibrowser.h
@@ -39,6 +39,8 @@ namespace BrowserAutomationStudioFramework
         virtual void SetWorker(IWorker* Worker) = 0;
         virtual IWorker* GetWorker() = 0;
         virtual void SetOpenFileName(const QString & OpenFileName, const QString& callback) = 0;
+        virtual void SetPromptResult(const QString & Text, const QString& callback) = 0;
+        virtual void SetHttpAuthResult(const QString & Login, const QString & Password, const QString& callback) = 0;
         virtual void MouseClickInstant(int x, int y) = 0;
         virtual void MouseClick(int x, int y, const QString& callback) = 0;
         virtual void MouseMove(int x, int y, const QString& callback) = 0;
diff --git a/Engine/irecordprocesscommunication.h b/Engine/irecordprocesscommunication.h
index 1022084..9ada4f7 100644
--- a/Engine/irecordprocesscommunication.h
+++ b/Engine/irecordprocesscommunication.h
@@ -25,6 +25,7 @@ namespace BrowserAutomationStudioFramework
         void Stop();
     public slots:
         virtual void SendIsChanged() = 0;
+        virtual void StopRecorder() = 0;
         virtual void SendCode(const QString& Code) = 0;
         virtual void SendResources(const QList<ResourceDescription>& Resources) = 0;
         virtual void SetWindow(const QString& Window) = 0;
diff --git a/Engine/qtresourcecontroller.cpp b/Engine/qtresourcecontroller.cpp
index 008c2b5..5f04e2d 100644
--- a/Engine/qtresourcecontroller.cpp
+++ b/Engine/qtresourcecontroller.cpp
@@ -546,6 +546,7 @@ namespace BrowserAutomationStudioFramework
         w->SetVariableName("place_variable_name");
         MultiLanguageString str;
         str.SetTranslation("en","PLEASE FILL DESCRIPTION");
+        str.SetTranslation("ru",QString::fromStdWString(std::wstring(L"\x0412\x0412\x0415\x0414\x0418\x0422\x0415\x0020\x041E\x041F\x0418\x0421\x0410\x041D\x0418\x0415")));
         w->SetDescription(str);
         w->SetTypeId("FixedStringValue");
         GetLayoutForSection("")->addWidget(w->GetMainWidget());
diff --git a/Engine/recordprocesscommunication.cpp b/Engine/recordprocesscommunication.cpp
index b4144f0..8e14911 100644
--- a/Engine/recordprocesscommunication.cpp
+++ b/Engine/recordprocesscommunication.cpp
@@ -27,6 +27,7 @@ namespace BrowserAutomationStudioFramework
         }
     }
 
+
     QString RecordProcessCommunication::ConvertResources(const QList<IRecordProcessCommunication::ResourceDescription>& Resources)
     {
         QJsonArray array;
@@ -59,6 +60,11 @@ namespace BrowserAutomationStudioFramework
         }
     }
 
+    void RecordProcessCommunication::StopRecorder()
+    {
+        emit Stop();
+    }
+
     void RecordProcessCommunication::SetWindow(const QString& Window)
     {
         if(Comunicator && CanSend)
diff --git a/Engine/recordprocesscommunication.h b/Engine/recordprocesscommunication.h
index d54bc88..acd1ef9 100644
--- a/Engine/recordprocesscommunication.h
+++ b/Engine/recordprocesscommunication.h
@@ -30,6 +30,7 @@ namespace BrowserAutomationStudioFramework
         void SetCanSendDataFalse();
     public slots:
         virtual void SendIsChanged();
+        virtual void StopRecorder();
         virtual void SendCode(const QString& Code);
         virtual void SetWindow(const QString& Window);
         virtual void SendResources(const QList<ResourceDescription>& Resources);
diff --git a/Engine/scripts/engine/common/helpers.js b/Engine/scripts/engine/common/helpers.js
index d59a8e3..3e8d025 100644
--- a/Engine/scripts/engine/common/helpers.js
+++ b/Engine/scripts/engine/common/helpers.js
@@ -63,6 +63,17 @@ function proxy_parse(proxy_string)
     proxy_string = proxy_string.replace(new RegExp("\\\\",'g'),":");
     proxy_string = proxy_string.replace(new RegExp("\\/",'g'),":");
     proxy_string = proxy_string.replace(new RegExp("\\s",'g'),"");
+
+    var ipv6regexp = new RegExp("\\[[^\\]]+\\]");
+    var ipv6match = proxy_string.match(ipv6regexp)
+    var ipv6addr = ""
+    if(ipv6match)
+    {
+        ipv6addr = ipv6match[0]
+        proxy_string = proxy_string.replace(ipv6regexp,"127.0.0.1");
+    }
+
+
     var list = proxy_string.split(":")
     for(var i = 0;i<list.length;i++)
     {
@@ -86,6 +97,10 @@ function proxy_parse(proxy_string)
         if(server.length == 0 && el.indexOf(".")>=0)
         {
             server = el
+            if(ipv6addr.length>0)
+            {
+                server = server.replace("127.0.0.1",ipv6addr)
+            }
             continue;
         }
         if(el.length>0)
diff --git a/Engine/scripts/engine/worker/worker.js b/Engine/scripts/engine/worker/worker.js
index a87e415..1c684ac 100644
--- a/Engine/scripts/engine/worker/worker.js
+++ b/Engine/scripts/engine/worker/worker.js
@@ -73,6 +73,24 @@ function open_file_dialog(text, callback)
     Browser.SetOpenFileName(text,_get_function_body(callback));
 }
 
+function prompt_result(text, callback)
+{
+    _ensure_browser_created();
+    Browser.SetPromptResult(text,_get_function_body(callback));
+}
+
+function http_auth_result(login, pass, callback)
+{
+    _ensure_browser_created();
+    Browser.SetHttpAuthResult(login,pass,_get_function_body(callback));
+}
+
+function open_file_dialog(text, callback)
+{
+    _ensure_browser_created();
+    Browser.SetPromptResult(text,_get_function_body(callback));
+}
+
 function screenshot(path, callback)
 {
     _ensure_browser_created();
diff --git a/Engine/subprocessbrowser.cpp b/Engine/subprocessbrowser.cpp
index 1fb36ca..7fad726 100644
--- a/Engine/subprocessbrowser.cpp
+++ b/Engine/subprocessbrowser.cpp
@@ -125,6 +125,30 @@ namespace BrowserAutomationStudioFramework
         Worker->GetProcessComunicator()->Send(WriteString);
     }
 
+    void SubprocessBrowser::SetPromptResult(const QString & Text, const QString& callback)
+    {
+        QString WriteString;
+        QXmlStreamWriter xmlWriter(&WriteString);
+        xmlWriter.writeTextElement("SetPromptResult",Text);
+
+        Worker->SetScript(callback);
+        Worker->SetFailMessage(QString("Timeout during SetPromptResult ") + Text);
+        Worker->GetWaiter()->WaitForSignal(this,SIGNAL(SetPromptResult()), Worker,SLOT(RunSubScript()), Worker, SLOT(FailBecauseOfTimeout()));
+        Worker->GetProcessComunicator()->Send(WriteString);
+    }
+
+    void SubprocessBrowser::SetHttpAuthResult(const QString & Login, const QString & Password, const QString& callback)
+    {
+        QString WriteString;
+        QXmlStreamWriter xmlWriter(&WriteString);
+        xmlWriter.writeTextElement("SetHttpAuthResult",Login + ":" + Password);
+
+        Worker->SetScript(callback);
+        Worker->SetFailMessage(QString("Timeout during SetHttpAuthResult ") + Login);
+        Worker->GetWaiter()->WaitForSignal(this,SIGNAL(SetHttpAuthResult()), Worker,SLOT(RunSubScript()), Worker, SLOT(FailBecauseOfTimeout()));
+        Worker->GetProcessComunicator()->Send(WriteString);
+    }
+
     void SubprocessBrowser::SetUserAgent(const QString& agent, const QString& callback)
     {
         QString WriteString;
@@ -267,7 +291,15 @@ namespace BrowserAutomationStudioFramework
             }else if(xmlReader.name() == "SetOpenFileName" && token == QXmlStreamReader::StartElement)
             {
                 emit SetOpenFileName();
-            }else if(xmlReader.name() == "GetCookiesForUrl" && token == QXmlStreamReader::StartElement)
+            }else if(xmlReader.name() == "SetPromptResult" && token == QXmlStreamReader::StartElement)
+            {
+                emit SetPromptResult();
+            }
+            else if(xmlReader.name() == "SetHttpAuthResult" && token == QXmlStreamReader::StartElement)
+            {
+                emit SetHttpAuthResult();
+            }
+            else if(xmlReader.name() == "GetCookiesForUrl" && token == QXmlStreamReader::StartElement)
             {
                 xmlReader.readNext();
                 Worker->SetAsyncResult(QScriptValue(xmlReader.text().toString()));
diff --git a/Engine/subprocessbrowser.h b/Engine/subprocessbrowser.h
index b02c059..077c6ea 100644
--- a/Engine/subprocessbrowser.h
+++ b/Engine/subprocessbrowser.h
@@ -39,6 +39,8 @@ namespace BrowserAutomationStudioFramework
         virtual void SetWorker(IWorker* Worker);
         virtual IWorker* GetWorker();
         virtual void SetOpenFileName(const QString & OpenFileName, const QString& callback);
+        virtual void SetPromptResult(const QString & Text, const QString& callback);
+        virtual void SetHttpAuthResult(const QString & Login, const QString & Password, const QString& callback);
         virtual void MouseClickInstant(int x, int y);
         virtual void MouseClick(int x, int y, const QString& callback);
         virtual void MouseMove(int x, int y, const QString& callback);
@@ -63,6 +65,8 @@ namespace BrowserAutomationStudioFramework
         void SaveCookies();
         void RestoreCookies();
         void SetOpenFileName();
+        void SetHttpAuthResult();
+        void SetPromptResult();
         void MouseClick();
         void MouseMove();
         void Resize();
diff --git a/Engine/text/apilist.txt b/Engine/text/apilist.txt
index 0d2c092..cec5c53 100644
--- a/Engine/text/apilist.txt
+++ b/Engine/text/apilist.txt
@@ -168,6 +168,8 @@ scroll(x, y)!
 render(x, y, width, height)!
 load(text)!
 open_file_dialog(text)!
+prompt_result(text)!
+http_auth_result(login,password)!
 screenshot(path)!
 url()!
 get_cookies(url)!
diff --git a/Engine/translate/ru.qm b/Engine/translate/ru.qm
index bd550d07a7f8b55dacc3fb961a77b3ce08e014d8..cc9e83f70f644a1e16129bf0accf346293fe445e 100644
GIT binary patch
delta 3196
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

delta 3115
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
Vw?|4)mHpl@WkTz{6YTq6_#aCEy<q?V

diff --git a/Engine/versioninfo.cpp b/Engine/versioninfo.cpp
index 15a8d69..9fa373f 100644
--- a/Engine/versioninfo.cpp
+++ b/Engine/versioninfo.cpp
@@ -16,7 +16,7 @@ namespace BrowserAutomationStudioFramework
 
     int VersionInfo::MinorVersion()
     {
-        return 0;
+        return 3;
     }
 
     int VersionInfo::BuildVersion()
diff --git a/Modules/ReCaptcha2/js/captcha2_code.js b/Modules/ReCaptcha2/js/captcha2_code.js
index 2462fb2..acc9e15 100644
--- a/Modules/ReCaptcha2/js/captcha2_code.js
+++ b/Modules/ReCaptcha2/js/captcha2_code.js
@@ -18,6 +18,7 @@ if(<%= method %> == "dbc")
   dbc(<%= dbc %>)
 }
 
+RECAPTCHA2_FIRST_TIME = true
 
 <%= waiter %>
 _do(function(){
@@ -75,21 +76,63 @@ _do(function(){
     _break()
 
   frame("google.com/recaptcha/api2/frame").script("window.getComputedStyle(document.getElementsByClassName('rc-imageselect-incorrect-response')[0])['display']")!
-  if(_result() != "none" && !RECAPTCHA2_SOLVED)
+  _if(_result() != "none" && !RECAPTCHA2_SOLVED, function(){
     solver_failed()
+    wait_load("recaptcha/api2/payload")!
+  })!
+    
 
   if(_iterator() > <%= timestosolve %>)
     fail("Too many fails solve recaptcha 2")
 
-  wait_load("recaptcha/api2/payload")!
+
+  _if(RECAPTCHA2_FIRST_TIME, function(){
+    RECAPTCHA2_FIRST_TIME = false
+    wait_load("recaptcha/api2/payload")!
+  })!
+  
 
   sleep(3000)!
 
+  frame("google.com/recaptcha/api2/frame").script("document.getElementsByClassName('rc-imageselect-tileselected').length")!
+  RECAPTCHA2_TOTAL_SELECTED = parseInt(_result())
+
+  _if(RECAPTCHA2_TOTAL_SELECTED>0, function(){
+    frame("google.com/recaptcha/api2/frame").script("document.getElementById('recaptcha-reload-button').getBoundingClientRect().top")!
+    TOP_RECAPTCHA_RELOAD_BUTTON = parseInt(_result())
+
+    frame("google.com/recaptcha/api2/frame").script("document.getElementById('recaptcha-reload-button').getBoundingClientRect().left")!
+    LEFT_RECAPTCHA_RELOAD_BUTTON = parseInt(_result())
+
+    move(LEFT + LEFT_RECAPTCHA_RELOAD_BUTTON + 12, TOP + TOP_RECAPTCHA_RELOAD_BUTTON + 12)!
+    cache_data_clear()!
+    mouse(LEFT + LEFT_RECAPTCHA_RELOAD_BUTTON + 12, TOP + TOP_RECAPTCHA_RELOAD_BUTTON + 12)!
+
+    wait_load("recaptcha/api2/payload")!
+    
+    _next()
+  })!
+
+
   match("src=\"https://www.google.com/recaptcha/api2/frame").script("self.getBoundingClientRect().top + window.scrollY")!
   TOP = parseInt(_result())
   match("src=\"https://www.google.com/recaptcha/api2/frame").script("self.getBoundingClientRect().left + window.scrollX")!
   LEFT = parseInt(_result())
 
+
+  frame("google.com/recaptcha/api2/frame").script("document.getElementById('rc-imageselect-target').getBoundingClientRect().top")!
+  TOP_PIC = parseInt(_result())
+
+  frame("google.com/recaptcha/api2/frame").script("document.getElementById('rc-imageselect-target').getBoundingClientRect().bottom")!
+  BOTTOM_PIC = parseInt(_result())
+
+  frame("google.com/recaptcha/api2/frame").script("document.getElementById('rc-imageselect-target').getBoundingClientRect().left")!
+  LEFT_PIC = parseInt(_result())
+
+  frame("google.com/recaptcha/api2/frame").script("document.getElementById('rc-imageselect-target').getBoundingClientRect().right")!
+  RIGHT_PIC = parseInt(_result())
+  
+
   frame("google.com/recaptcha/api2/frame").script("document.getElementsByClassName('rc-imageselect-table-33').length")!
   IS33 = parseInt(_result()) > 0
 
@@ -99,6 +142,7 @@ _do(function(){
   frame("google.com/recaptcha/api2/frame").script("document.getElementsByClassName('rc-imageselect-table-42').length")!
   IS42 = parseInt(_result()) > 0
 
+
   if(!IS33 && !IS44 && !IS42)
   {
     fail("Unknown captcha type")
@@ -108,7 +152,7 @@ _do(function(){
   match("src=\"https://www.google.com/recaptcha/api2/frame").render_base64()!
   solve_base64(<%= method %>, _result())!
   RECAPTCHA2_SOLVED = _result()
-  CLICKS = NumbersParseRecaptcha2(RECAPTCHA2_SOLVED,IS33,IS44,IS42)
+  CLICKS = NumbersParseRecaptcha2(RECAPTCHA2_SOLVED,IS33,IS44,IS42,TOP_PIC,LEFT_PIC,BOTTOM_PIC,RIGHT_PIC)
   
   match("src=\"https://www.google.com/recaptcha/api2/frame").script("window.getComputedStyle(self)['visibility']")!
   if(_result() == "hidden")
@@ -118,8 +162,31 @@ _do(function(){
   _do(function(){
     if(_iterator() > CLICKS.length)
       _break(1)
+
+    cache_data_clear()!
+
+    frame("google.com/recaptcha/api2/frame").script("document.getElementsByClassName('rc-imageselect-tileselected').length")!
+    RECAPTCHA2_TOTAL_SELECTED = parseInt(_result())
+
+
     move(LEFT + CLICKS[_iterator() - 1][0],TOP + CLICKS[_iterator() - 1][1])!
     mouse(LEFT + CLICKS[_iterator() - 1][0],TOP + CLICKS[_iterator() - 1][1])!
+
+    _do(function(){
+     if(_iterator() > 60)
+        fail("Failed to wait select responce")
+      
+        frame("google.com/recaptcha/api2/frame").script("document.getElementsByClassName('rc-imageselect-tileselected').length")!
+        if(RECAPTCHA2_TOTAL_SELECTED != parseInt(_result()))
+          _break()
+
+        is_load("recaptcha/api2/payload")!
+        if(_result())
+          _break()
+
+        sleep(1000)!
+    })!
+
   })!
 
   sleep(1000)!
diff --git a/Modules/ReCaptcha2/js/engine.js b/Modules/ReCaptcha2/js/engine.js
index 91755c1..86e7bd3 100644
--- a/Modules/ReCaptcha2/js/engine.js
+++ b/Modules/ReCaptcha2/js/engine.js
@@ -1,5 +1,7 @@
-function NumbersParseRecaptcha2(resp,IS33,IS44,IS42)
+function NumbersParseRecaptcha2(resp,IS33,IS44,IS42,TOP_PIC,LEFT_PIC,BOTTOM_PIC,RIGHT_PIC)
 {
+	if(typeof(TOP_PIC) == "undefined")
+		die("You are using old action. Please recreate Recaptcha2 action.")
 	var CLICKS = []
 	if(resp.indexOf("coordinates:") >= 0 || resp.indexOf("coordinate:") >= 0)
 	{
@@ -31,88 +33,88 @@ function NumbersParseRecaptcha2(resp,IS33,IS44,IS42)
 		{
 			var num = parseInt(resp[i])
 			if(num == 1)
-				CLICKS.push([62,182])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.166),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.166)])
 			else if(num == 2)
-				CLICKS.push([192,182])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.5),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.166)])
 			else if(num == 3)
-				CLICKS.push([321,182])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.833),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.166)])
 			else if(num == 4)
-				CLICKS.push([62,307])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.166),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.5)])
 			else if(num == 5)
-				CLICKS.push([192,307])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.5),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.5)])
 			else if(num == 6)
-				CLICKS.push([321,307])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.833),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.5)])
 			else if(num == 7)
-				CLICKS.push([62,432])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.166),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.833)])
 			else if(num == 8)
-				CLICKS.push([192,432])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.5),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.833)])
 			else if(num == 9)
-				CLICKS.push([321,432])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.833),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.833)])
 		}else if(IS44)
 		{
 			var num = parseInt(resp[i])
 			if(num == 1)
-				CLICKS.push([60,175])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.125),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.125)])
 			else if(num == 2)
-				CLICKS.push([154,175])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.375),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.125)])
 			else if(num == 3)
-				CLICKS.push([250,175])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.625),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.125)])
 			else if(num == 4)
-				CLICKS.push([343,175])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.875),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.125)])
 
 			else if(num == 5)
-				CLICKS.push([60,268])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.125),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.375)])
 			else if(num == 6)
-				CLICKS.push([154,268])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.375),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.375)])
 			else if(num == 7)
-				CLICKS.push([250,268])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.625),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.375)])
 			else if(num == 8)
-				CLICKS.push([343,268])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.875),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.375)])
 
 
 			else if(num == 9)
-				CLICKS.push([60,365])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.125),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.625)])
 			else if(num == 10)
-				CLICKS.push([154,365])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.375),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.625)])
 			else if(num == 11)
-				CLICKS.push([250,365])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.625),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.625)])
 			else if(num == 12)
-				CLICKS.push([343,365])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.875),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.625)])
 
 
 			else if(num == 13)
-				CLICKS.push([60,465])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.125),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.875)])
 			else if(num == 14)
-				CLICKS.push([154,465])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.375),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.875)])
 			else if(num == 15)
-				CLICKS.push([250,465])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.625),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.875)])
 			else if(num == 16)
-				CLICKS.push([343,465])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.875),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.875)])
 			
 		}else if(IS42)
 		{
 			var num = parseInt(resp[i])
 			if(num == 1)
-				CLICKS.push([110,175])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.25),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.125)])
 			else if(num == 2)
-				CLICKS.push([290,175])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.75),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.125)])
 			
 			else if(num == 3)
-				CLICKS.push([110,268])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.25),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.375)])
 			else if(num == 4)
-				CLICKS.push([290,268])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.75),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.375)])
 			
 
 			else if(num == 5)
-				CLICKS.push([110,365])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.25),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.625)])
 			else if(num == 6)
-				CLICKS.push([290,365])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.75),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.625)])
 			
 
 			else if(num == 7)
-				CLICKS.push([110,465])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.25),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.875)])
 			else if(num == 8)
-				CLICKS.push([290,465])
+				CLICKS.push([LEFT_PIC + (RIGHT_PIC - LEFT_PIC) * (0.75),TOP_PIC + (BOTTOM_PIC - TOP_PIC) * (0.875)])
 			
 		}
 	}
diff --git a/Modules/ReCaptcha2/js/manifest.json b/Modules/ReCaptcha2/js/manifest.json
index 087d4ff..a627c3b 100644
--- a/Modules/ReCaptcha2/js/manifest.json
+++ b/Modules/ReCaptcha2/js/manifest.json
@@ -3,7 +3,7 @@
 	"name":"ReCaptcha2",
 	"description":"Solve Recaptcha 2.0",
 	"description_small":{"en": "Recaptcha 2.0", "ru": "Recaptcha 2.0"},
-	"major_version": 1,
+	"major_version": 2,
 	"minor_version": 0,
 	"developer_name": "bablosoft", 
 	"developer_email": "mail.to.twaego@gmail.com", 
diff --git a/Studio/mainwindow.cpp b/Studio/mainwindow.cpp
index a02af5a..4edce15 100644
--- a/Studio/mainwindow.cpp
+++ b/Studio/mainwindow.cpp
@@ -553,6 +553,8 @@ void MainWindow::OpenFromFileOrDisplayMessageBox(const QString& fileName)
         QMessageBox::warning(0, tr("Error loading file"), QString(tr("Error loading file : %1")).arg(Result));
     }else
     {
+        if(_RecordProcessCommunication)
+            _RecordProcessCommunication->StopRecorder();
         SetCurrentFileName(fileName);
 		Settings->setValue("CurrentFileName",CurrentFileName);
     }
@@ -684,6 +686,8 @@ void MainWindow::New()
     QString fileName = QFileDialog::getSaveFileName(this, tr("Create Project"), "", tr("Project Files (*.xml);;All Files (*.*)"));
     if(fileName.length()>0)
     {
+        if(_RecordProcessCommunication)
+            _RecordProcessCommunication->StopRecorder();
         Output->SetDefaults();
         TextEditor->Clear();
         SetDefaultText();