diff --git a/_examples/sectiondemo.html b/_examples/sectiondemo.html
index b578c65f4..f62554e6f 100644
--- a/_examples/sectiondemo.html
+++ b/_examples/sectiondemo.html
@@ -169,7 +169,7 @@ <h1>目录大纲demo</h1>
     function getSubStr(s,l){
         var i=0,len=0;
         for(i;i<s.length;i++){
-            if(s[i].match(/[^\x00-\xff]/g)!=null){
+            if(s.charAt(i).match(/[^\x00-\xff]/g)!=null){
                 len+=2;
             }else{
                 len++;
diff --git a/asp/Uploader.Class.asp b/asp/Uploader.Class.asp
index 86630482c..1e83728f4 100644
--- a/asp/Uploader.Class.asp
+++ b/asp/Uploader.Class.asp
@@ -202,7 +202,11 @@ Class Uploader
 
     Private Function GetSaveName( ByVal filename )
         Dim format, ext, name
-        format = rsFormValues.Item( "fileNameFormat" )
+        If rsFormValues <> Null Then
+            format = rsFormValues.Item( "fileNameFormat" )
+        Else
+            format = "{yyyy}{mm}{dd}{hh}{ii}{ss}{rand:6}"
+        End If
         ext = GetExt( filename )
         name = GetNameWithoutExt( filename )
         filename = Replace( format, "{filename}", name )
diff --git a/dialogs/background/background.js b/dialogs/background/background.js
index bf8f47701..af2035f58 100755
--- a/dialogs/background/background.js
+++ b/dialogs/background/background.js
@@ -207,7 +207,7 @@
                 item.selected = (align == item.getAttribute('value') ? 'selected':false);
             });
         }
-        if(x && y) {
+        if(x || y) {
             $G('x').value = parseInt(x) || 0;
             $G('y').value = parseInt(y) || 0;
         }
diff --git a/lang/en/en.js b/lang/en/en.js
index 73207736c..6dea0d5ec 100755
--- a/lang/en/en.js
+++ b/lang/en/en.js
@@ -416,7 +416,7 @@ UE.I18N['en'] = {
         'static':{
             'lang_input_about':'About',
             'lang_input_shortcuts':'Shortcuts',
-            'lang_input_version':'Version:1.3.5',
+            'lang_input_version':'Version:1.3.6',
             'lang_input_introduction':"UEditor is developed by Baidu Co.ltd.  It is lightweight, customizable , focusing on user experience and etc. , UEditor is based on open source BSD license , allowing free use and redistribution.",
             'lang_Txt_shortcuts':'Shortcuts',
             'lang_Txt_func':'Function',
diff --git a/lang/zh-cn/zh-cn.js b/lang/zh-cn/zh-cn.js
index 42843fb27..67a7e12f4 100755
--- a/lang/zh-cn/zh-cn.js
+++ b/lang/zh-cn/zh-cn.js
@@ -399,7 +399,7 @@ UE.I18N['zh-cn'] = {
         'static':{
             'lang_input_about':'关于UEditor',
             'lang_input_shortcuts':'快捷键',
-            'lang_input_version':'版本:1.3.5',
+            'lang_input_version':'版本:1.3.6',
             'lang_input_introduction':'UEditor是由百度web前端研发部开发的所见即所得富文本web编辑器，具有轻量，可定制，注重用户体验等特点。开源基于BSD协议，允许自由使用和修改代码。',
             'lang_Txt_shortcuts':'快捷键',
             'lang_Txt_func':'功能',
diff --git a/package.json b/package.json
index f24a6c9ab..862cbea9a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "ueditor",
     "description": "UEditor富文本web编辑器",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "homepage": "http://ueditor.baidu.com/",
     "dependencies": {
         "grunt": "~0.4.1",