diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index dd18e3fcd1..b606fdb57a 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 6.1dev-160930
+Version: 6.1dev-161003
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index e661e3914e..bfc956094e 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.1dev-160930"
+pandora_version="6.1dev-161003"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 5c7ccc7f4f..9c2035485d 100644
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '6.1dev';
-use constant AGENT_BUILD => '160930';
+use constant AGENT_BUILD => '161003';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index f667aca985..0de68c3e6d 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     6.1dev
-%define release     160930
+%define release     161003
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 8968083295..0a8aaf77a4 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     6.1dev
-%define release     160930
+%define release     161003
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 1150df3f17..8c0bf0a456 100644
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="6.1dev"
-PI_BUILD="160930"
+PI_BUILD="161003"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 167af6a1ec..467fcb7a17 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{160930}
+{161003}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0bbdb9adb6..568c91c985 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("6.1dev(Build 160930)")
+#define PANDORA_VERSION ("6.1dev(Build 161003)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d620de0b11..37e76f8e27 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(6.1dev(Build 160930))"
+      VALUE "ProductVersion", "(6.1dev(Build 161003))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 526a40347a..3e260afbb2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 6.1dev-160930
+Version: 6.1dev-161003
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 3054dd3500..1015f8f023 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.1dev-160930"
+pandora_version="6.1dev-161003"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 0c48aaecb7..8ed18ea1a0 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -188,7 +188,7 @@ config_check();
 					$_GET['refr'] = null;
 				}
 				
-				if (array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
+				if ($config['autorefresh_white_list'] !== null && array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
 					$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh')));
 					
 					if ($_GET['refr']) {
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 416708385b..6fdfacf156 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC160930';
+$build_version = 'PC161003';
 $pandora_version = 'v6.1dev';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/help/ja/help_reports_label_field.php b/pandora_console/include/help/ja/help_reports_label_field.php
new file mode 100755
index 0000000000..f2dfff5c86
--- /dev/null
+++ b/pandora_console/include/help/ja/help_reports_label_field.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package Include/help/ja
+ */
+?>
+<h1>レポート - ラベルフィールドマクロ</h1>
+<p>
+
+次のマクロも使えます: <br />
+	<ul>
+    <li><b>_agent_ </b>: レポートアイテムで選択したエージェント名。<li />
+	<li><b>_agentdescription_ </b>: レポートアイテムで選択したエージェントの説明。<li />
+    <li><b>_agentgroup_ </b>: エージェントグループ名。<li />
+    <li><b>_address_</b> : レポートアイテムで選択したエージェントのアドレス。<li />
+	<ul />
+	<br />
+	
+	<ul>
+	エージェントモジュールのフォームで利用可能なもの<br />
+	<li><b>_module_ </b>: レポートアイテムで選択したモジュール名。<li />
+	<li><b>_moduledescription_</b> : レポートアイテムで選択したモジュールの説明。<li />
+	<ul />
+例: エージェント: <b>_agent_</b> /  モジュール: <b>_module_</b><br />
+
+</p>
diff --git a/pandora_console/include/help/ja/help_snmp_alert_configuration.php b/pandora_console/include/help/ja/help_snmp_alert_configuration.php
new file mode 100644
index 0000000000..ee99930452
--- /dev/null
+++ b/pandora_console/include/help/ja/help_snmp_alert_configuration.php
@@ -0,0 +1,9 @@
+<?php
+/*
+* @package Include /help/ja
+*/
+?>
+
+<h1>アラート設定</h1>
+
+<p>これらは、SNMP アラート設定で必要なフィールドです。フィールドの一部は、"フィールド #x のマッチ" および "カスタム値/OID" フィールドからのマクロを使うことができます。</p>
diff --git a/pandora_console/include/help/ja/help_visual_console_editor_list_elements_tab.php b/pandora_console/include/help/ja/help_visual_console_editor_list_elements_tab.php
new file mode 100644
index 0000000000..315fcb4f10
--- /dev/null
+++ b/pandora_console/include/help/ja/help_visual_console_editor_list_elements_tab.php
@@ -0,0 +1,9 @@
+<?php
+/*
+* @package Include/help/ja/
+*/
+?>
+
+<h1>要素一覧</h1>
+
+<p>このタブは、編集中のビジュアルコンソールの要素のファイルまとめて表示します。異なる要素をすばやく編集でき、要素の値を調整する必要がある場合に便利なツールです。</p>
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1dda34f287..ce3a7a5181 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '6.1dev';
-$build = '160930';
+$build = '161003';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index e966b96545..0ed638f1e0 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.1dev
-%define release     160930
+%define release     161003
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e2bb3994be..70bbbf753a 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.1dev
-%define release     160930
+%define release     161003
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql
index 8f6e9ed137..50a138c1fb 100644
--- a/pandora_console/pandoradb.data.oracle.sql
+++ b/pandora_console/pandoradb.data.oracle.sql
@@ -66,7 +66,7 @@ INSERT INTO tconfig (token, value) VALUES ('graph_res','5');
 INSERT INTO tconfig (token, value) VALUES ('step_compact','1');
 INSERT INTO tconfig (token, value) VALUES ('db_scheme_first_version','6.0orc');
 INSERT INTO tconfig (token, value) VALUES('db_scheme_version','6.1dev');
-INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160930');
+INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD161003');
 INSERT INTO tconfig (token, value) VALUES ('show_unknown','0');
 INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1');
 INSERT INTO tconfig (token, value) VALUES ('style','pandora');
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 350edbbf04..1028ef659f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 6.1dev-160930
+Version: 6.1dev-161003
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 1fcd50fec2..d5e5c25080 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.1dev-160930"
+pandora_version="6.1dev-161003"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 9f936285fe..feae6c4c29 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "6.1dev";
-my $pandora_build = "160930";
+my $pandora_build = "161003";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 3cca337c02..9699799d9d 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     6.1dev
-%define release     160930
+%define release     161003
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index e4caa26ea7..a98edde6f5 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     6.1dev
-%define release     160930
+%define release     161003
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index cf27658494..3c7860efc5 100644
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="6.1dev"
-PI_BUILD="160930"
+PI_BUILD="161003"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 161c615136..d08e808f32 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "6.1dev PS160930";
+my $version = "6.1dev PS161003";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 486c350985..6fcadf50ef 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "6.1dev PS160930";
+my $version = "6.1dev PS161003";
 
 # save program name for logging
 my $progname = basename($0);