diff --git a/.gitignore b/.gitignore
index 76da9d48..cf50acb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ doc/
 node_modules/
 spec/javascripts/*.js
 _*
+*.sublime*
+CakeFile
+.DS_Store
diff --git a/src/jquery.atwho.coffee b/src/jquery.atwho.coffee
index 906e8436..d101b157 100644
--- a/src/jquery.atwho.coffee
+++ b/src/jquery.atwho.coffee
@@ -70,6 +70,7 @@
     ESC: 27
     TAB: 9
     ENTER: 13
+    SHIFT: 16
 
   # Controller 用于处理渲染数据的一组方法.
   #为了方便开发者可以自定义插件的部分功能而独立出来.
@@ -102,7 +103,9 @@
     #
     # @return [String] 匹配后得到的字符串
     matcher: (flag, subtext) ->
-      regexp = new RegExp flag+'([A-Za-z0-9_\+\-]*)$|'+flag+'([^\\x00-\\xff]*)$','gi'
+      #排除email格式地址
+      preFlag = "(?:[\\W]"+flag+"|^"+flag+")"
+      regexp = new RegExp preFlag+'([A-Za-z0-9_\+\-]*)$|'+preFlag+'([^\\x00-\\xff]*)$','gi'
       match = regexp.exec subtext
       matched = null
       if match
@@ -187,7 +190,7 @@
   class Controller
 
     # @param inputor [HTML DOM Object] 输入框
-    constructor: (inputor) ->
+    constructor: (inputor,reg,options) ->
       @settings     = {}
       @common_settings       = {}
       @pos          = 0
@@ -197,20 +200,21 @@
 
       @$inputor = $(inputor)
       @mirror = new Mirror(@$inputor)
-      @common_settings = $.extend {}, $.fn.atWho.default
+      @common_settings = $.extend {}, $.fn.atwho.default
+      @reg reg ,options
       @view = new View(this, @$el)
       this.listen()
 
     # 绑定对输入框的各种监听事件
     listen: ->
       @$inputor
-        .on 'keyup.atWho', (e) =>
+        .on 'keyup.atwho', (e) =>
           this.on_keyup(e)
-        .on 'keydown.atWho', (e) =>
+        .on 'keydown.atwho', (e) =>
           this.on_keydown(e)
-        .on 'scroll.atWho', (e) =>
+        .on 'scroll.atwho', (e) =>
           @view.hide()
-        .on 'blur.atWho', (e) =>
+        .on 'blur.atwho', (e) =>
           @view.hide(1000)
 
     # At.js 可以对每个输入框绑定不同的监听标记. 比如同时监听 "@", ":" 字符
@@ -224,6 +228,7 @@
     # @param flag [String] 要监听的字符
     # @param settings [Hash] 配置哈希值
     reg: (flag, settings) ->
+      @inline_append=true if flag==""
       current_settings = {}
       current_settings = if $.isPlainObject(flag)
         @common_settings = $.extend {}, @common_settings, flag
@@ -257,7 +262,7 @@
     # @return [?] 配置项的值
     get_opt: (key, default_value) ->
       try
-        value = @settings[@current_flag][key] if @current_flag
+        value = if @settings[""] then @settings[""][key]  else @settings[@current_flag][key] if @current_flag?
         value = @common_settings[key] if value is undefined
         value = if value is undefined then default_value else value
       catch e
@@ -269,7 +274,7 @@
     rect: ->
       $inputor = @$inputor
       if document.selection # for IE full
-        Sel = document.selection.createRange()
+        Sel = document.selection.createTextRange()
         x = Sel.boundingLeft + $inputor.scrollLeft()
         y = Sel.boundingTop + $(window).scrollTop() + $inputor.scrollTop()
         bottom = y + Sel.boundingHeight
@@ -347,14 +352,14 @@
 
       $inputor.val text
       $inputor.caretPos start_str.length + str.length + 1
-      $inputor.change()
+      $inputor.change().focus()
 
     on_keyup: (e) ->
       switch e.keyCode
         when KEY_CODE.ESC
           e.preventDefault()
           @view.hide()
-        when KEY_CODE.DOWN, KEY_CODE.UP
+        when KEY_CODE.DOWN, KEY_CODE.UP, KEY_CODE.SHIFT
           $.noop()
         else
           this.look_up()
@@ -402,7 +407,7 @@
           q: query.text
           limit: this.get_opt("limit")
         # $.proxy(this.render_view, this)
-        this.callbacks('remote_filter').call(this, params, this.render_view)
+        this.callbacks('remote_filter').call(this, params, origin_data,this.render_view)
       else if (data = this.callbacks('filter').call(this, query.text, origin_data, search_key))
           this.render_view data
       else
@@ -425,17 +430,27 @@
     create_view: ->
       return if this.exist()
       tpl = "<div id='#{@id}' class='at-view'><ul id='#{@id}-ul'></ul></div>"
-      $("body").append(tpl)
+      if @controller.inline_append
+        $(tpl).insertAfter(@controller.$inputor)
+      else
+        $("body").append(tpl)
+
       @$el = $("##{@id}")
 
       $menu = @$el.find('ul')
-      $menu.on 'mouseenter.view','li', (e) ->
+      $menu.on 'mouseenter.view',@controller.get_opt('item_selector'), (e) ->
         $menu.find('.cur').removeClass 'cur'
         $(e.currentTarget).addClass 'cur'
       .on 'click', (e) =>
-        e.stopPropagation()
-        e.preventDefault()
-        this.choose()
+        if @$el.data("_view")?
+            e.stopPropagation()
+            e.preventDefault()
+            @$el.data("_view").choose() 
+
+      .on 'mousedown', (e) =>
+            e.stopPropagation()
+            e.preventDefault()
+            return
 
     # 判断视图是否存在
     #
@@ -457,22 +472,29 @@
 
     # 重置视图在页面中的位置.
     reposition: ->
-      rect = @controller.rect()
-      if rect.bottom + @$el.height() - $(window).scrollTop() > $(window).height()
-          rect.bottom = rect.top - @$el.height()
+      if @controller.current_flag
+          rect = @controller.rect()
+          if rect.bottom + @$el.height() - $(window).scrollTop() > $(window).height()
+              rect.bottom = rect.top - @$el.height()
+      else
+          rect = @controller.$inputor.offset()
+          rect.bottom = rect.top + @controller.$inputor.outerHeight()
+
       @$el.offset {left:rect.left, top:rect.bottom}
 
     next: ->
+      items = @$el.find(@controller.get_opt('item_selector'))
       cur = @$el.find('.cur').removeClass('cur')
-      next = cur.next()
-      next = $(@$el.find('li')[0]) if not next.length
-      next.addClass 'cur'
+      cur_index = items.index(cur)
+      next_index = if cur_index==items.length-1 then 0 else cur_index+1
+      items.eq(next_index).addClass 'cur'
 
     prev: ->
+      items = @$el.find(@controller.get_opt('item_selector'))
       cur = @$el.find('.cur').removeClass('cur')
-      prev = cur.prev()
-      prev = @$el.find('li').last() if not prev.length
-      prev.addClass('cur')
+      cur_index = items.index(cur)
+      prev_index = if prev_index==0 then items.length-1 else cur_index-1
+      items.eq(prev_index).addClass 'cur'
 
     show: ->
       @$el.show() if not this.visible()
@@ -496,6 +518,7 @@
         return yes
 
       this.clear()
+      @$el.data("_view",this)
 
       $ul = @$el.find('ul')
       tpl = @controller.get_opt('tpl', DEFAULT_TPL)
@@ -505,23 +528,23 @@
         $ul.append @controller.callbacks("highlighter").call(@controller, li, @controller.query.text)
 
       this.show()
-      $ul.find("li:eq(0)").addClass "cur"
+      $ul.find(@controller.get_opt('item_selector')+":eq(0)").addClass "cur"
 
 
   DEFAULT_TPL = "<li data-value='${name}'>${name}</li>"
 
-  $.fn.atWho = (flag, options) ->
+  $.fn.atwho = (flag, options) ->
     @.filter('textarea, input').each () ->
       $this = $(this)
-      data = $this.data "AtWho"
+      data = $this.data "atwho"
 
-      $this.data 'AtWho', (data = new Controller(this)) if not data
+      $this.data 'atwho', (data = new Controller(this,flag,options)) if not data
       data.reg flag, options
 
-  $.fn.atWho.Controller = Controller
-  $.fn.atWho.View = View
-  $.fn.atWho.Mirror = Mirror
-  $.fn.atWho.default =
+  $.fn.atwho.Controller = Controller
+  $.fn.atwho.View = View
+  $.fn.atwho.Mirror = Mirror
+  $.fn.atwho.default =
       data: null
       search_key: "name"
       callbacks: DEFAULT_CALLBACKS
@@ -529,5 +552,6 @@
       display_flag: yes
       display_timeout: 300
       tpl: DEFAULT_TPL
+      item_selector: "li"
 
 )(window.jQuery)