diff --git a/src/PHPCensor/Controller/ProjectController.php b/src/PHPCensor/Controller/ProjectController.php
index 5ea02dcf..bb17db0c 100644
--- a/src/PHPCensor/Controller/ProjectController.php
+++ b/src/PHPCensor/Controller/ProjectController.php
@@ -115,8 +115,16 @@ class ProjectController extends PHPCensor\Controller
             throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
         }
 
+        $debug = (boolean)$this->getParam('debug', false);
+        $extra = null;
+        if ($debug && $this->currentUserIsAdmin()) {
+            $extra = [
+                'debug' => true,
+            ];
+        }
+
         $email = $_SESSION['php-censor-user']->getEmail();
-        $build = $this->buildService->createBuild($project, null, urldecode($branch), $email);
+        $build = $this->buildService->createBuild($project, null, urldecode($branch), $email, null, $extra);
 
         if ($this->buildService->queueError) {
             $_SESSION['global_error'] = Lang::get('add_to_queue_failed');
diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index 6da0e0ee..e54c11a4 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -66,7 +66,8 @@ PHP Censor',
     'manage_users' => 'Manage Users',
     'plugins' => 'Plugins',
     'view' => 'View',
-    'build_now' => 'Build Now',
+    'build_now' => 'Build now',
+    'build_now_debug' => 'Build now with debug',
     'edit_project' => 'Edit Project',
     'delete_project' => 'Delete Project',
 
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index 50e3f34f..9a1cad9a 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -65,6 +65,7 @@ PHP Censor',
     'plugins' => 'Плагины',
     'view' => 'Отчет',
     'build_now' => 'Собрать',
+    'build_now_debug' => 'Собрать в режиме отладки',
     'edit_project' => 'Редактировать проект',
     'delete_project' => 'Удалить проект',
 
diff --git a/src/PHPCensor/Logging/BuildLogger.php b/src/PHPCensor/Logging/BuildLogger.php
index ac9efee0..b1e58c83 100644
--- a/src/PHPCensor/Logging/BuildLogger.php
+++ b/src/PHPCensor/Logging/BuildLogger.php
@@ -38,7 +38,7 @@ class BuildLogger implements LoggerAwareInterface
     public function __construct(LoggerInterface $logger, Build $build)
     {
         $this->logger = $logger;
-        $this->build = $build;
+        $this->build  = $build;
     }
 
     /**
@@ -101,7 +101,10 @@ class BuildLogger implements LoggerAwareInterface
      */
     public function logDebug($message)
     {
-        if (defined('DEBUG_MODE') && DEBUG_MODE) {
+        if (
+            (defined('DEBUG_MODE') && DEBUG_MODE) ||
+            ((boolean)$this->build->getExtra('debug'))
+        ) {
             $this->log("\033[0;36m" . $message . "\033[0m");
         }
     }
diff --git a/src/PHPCensor/Model/Build.php b/src/PHPCensor/Model/Build.php
index d4f25945..b259b1bc 100644
--- a/src/PHPCensor/Model/Build.php
+++ b/src/PHPCensor/Model/Build.php
@@ -522,6 +522,8 @@ class Build extends Model
      */
     public function setExtra($value)
     {
+        $value = json_encode($value);
+        
         $this->validateString('Extra', $value);
 
         if ($this->data['extra'] === $value) {
diff --git a/src/PHPCensor/Service/BuildService.php b/src/PHPCensor/Service/BuildService.php
index 26017a16..e40f3ff4 100644
--- a/src/PHPCensor/Service/BuildService.php
+++ b/src/PHPCensor/Service/BuildService.php
@@ -87,7 +87,7 @@ class BuildService
         }
 
         if (!is_null($extra)) {
-            $build->setExtra(json_encode($extra));
+            $build->setExtra($extra);
         }
 
         $build = $this->buildStore->save($build);
diff --git a/src/PHPCensor/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
index f01bc5f7..e2fe6ca5 100644
--- a/src/PHPCensor/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -16,7 +16,13 @@
 
     <div class="pull-right btn-group">
         <?php if (!$project->getArchived()): ?>
-            <a class="btn btn-success" href="<?php print APP_URL . 'project/build/' . $project->getId(); ?><?php echo !empty($branch) ? '/' . urlencode($branch) : '' ?>">
+            <?php if($this->User()->getIsAdmin()): ?>
+                <a class="btn btn-danger" href="<?= APP_URL . 'project/build/' . $project->getId(); ?><?= !empty($branch) ? '/' . urlencode($branch) : '' ?>?debug=1">
+                    <?php Lang::out('build_now_debug'); ?>
+                </a>
+            <?php endif; ?>
+
+            <a class="btn btn-success" href="<?= APP_URL . 'project/build/' . $project->getId(); ?><?= !empty($branch) ? '/' . urlencode($branch) : '' ?>">
                 <?php Lang::out('build_now'); ?>
             </a>
         <?php endif; ?>
diff --git a/tests/PHPCensor/Model/BuildTest.php b/tests/PHPCensor/Model/BuildTest.php
index 096fda34..efd699f4 100644
--- a/tests/PHPCensor/Model/BuildTest.php
+++ b/tests/PHPCensor/Model/BuildTest.php
@@ -63,7 +63,7 @@ class BuildTest extends \PHPUnit_Framework_TestCase
         ];
 
         $build = new Build();
-        $build->setExtra(json_encode($info));
+        $build->setExtra($info);
 
         $this->assertEquals('Item One', $build->getExtra('item1'));
         $this->assertEquals(2, $build->getExtra('item2'));
diff --git a/tests/PHPCensor/Service/BuildServiceTest.php b/tests/PHPCensor/Service/BuildServiceTest.php
index ba0f97ad..6cdfe63b 100644
--- a/tests/PHPCensor/Service/BuildServiceTest.php
+++ b/tests/PHPCensor/Service/BuildServiceTest.php
@@ -100,7 +100,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
         $build->setFinished(new \DateTime());
         $build->setCommitMessage('test');
         $build->setCommitterEmail('test@example.com');
-        $build->setExtra(json_encode(['item1' => 1001]));
+        $build->setExtra(['item1' => 1001]);
 
         $returnValue = $this->testedService->createDuplicateBuild($build);