diff --git a/autoload/emmet.vim b/autoload/emmet.vim
index 28ce2af..e7de5d3 100644
--- a/autoload/emmet.vim
+++ b/autoload/emmet.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " emmet.vim
 " Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
-" Last Change: 15-Oct-2013.
+" Last Change: 22-Oct-2013.
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -649,6 +649,12 @@ function! emmet#expandAbbr(mode, abbr) range
   return ''
 endfunction
 
+function! emmet#moveNextPrevItem(flag)
+  let type = emmet#getFileType()
+  let rtype = emmet#lang#exists(type) ? type : 'html'
+  return emmet#lang#{rtype}#moveNextPrevItem(a:flag)
+endfunction
+
 function! emmet#moveNextPrev(flag)
   let type = emmet#getFileType()
   let rtype = emmet#lang#exists(type) ? type : 'html'
@@ -773,7 +779,7 @@ function! emmet#codePretty() range
   call emmet#util#setContent(block, content)
 endfunction
 
-function! emmet#ExpandWord(abbr, type, orig)
+function! emmet#expandWord(abbr, type, orig)
   let mx = '|\(\%(html\|haml\|slim\|e\|c\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$'
   let str = a:abbr
   let type = a:type
@@ -815,7 +821,7 @@ function! emmet#getSnippets(type)
   return emmet#getResource(type, 'snippets', {})
 endfunction
 
-function! emmet#CompleteTag(findstart, base)
+function! emmet#completeTag(findstart, base)
   if a:findstart
     let line = getline('.')
     let start = col('.') - 1
diff --git a/autoload/emmet/lang/css.vim b/autoload/emmet/lang/css.vim
index fa3a763..ceff2a5 100644
--- a/autoload/emmet/lang/css.vim
+++ b/autoload/emmet/lang/css.vim
@@ -160,6 +160,11 @@ function! emmet#lang#css#toString(settings, current, type, inline, filters, item
 endfunction
 
 function! emmet#lang#css#imageSize()
+  "let img_region = emmet#util#searchRegion('url(', ')')
+  "if !emmet#util#regionIsValid(img_region) || !emmet#util#cursorInRegion(img_region)
+  "  return
+  "endif
+  "let content = emmet#util#getContent(img_region)
 endfunction
 
 function! emmet#lang#css#encodeImage()
@@ -241,6 +246,10 @@ function! emmet#lang#css#balanceTag(flag) range
   endif
 endfunction
 
+function! emmet#lang#css#moveNextPrevItem(flag)
+  return emmet#lang#css#moveNextPrev(a:flag)
+endfunction
+
 function! emmet#lang#css#moveNextPrev(flag)
   let pos = search('""\|()\|\(:\s*\zs$\)', a:flag ? 'Wbp' : 'Wp')
   if pos == 2
diff --git a/autoload/emmet/lang/haml.vim b/autoload/emmet/lang/haml.vim
index a8a2e40..6b41983 100644
--- a/autoload/emmet/lang/haml.vim
+++ b/autoload/emmet/lang/haml.vim
@@ -235,6 +235,10 @@ function! emmet#lang#haml#balanceTag(flag) range
   endif
 endfunction
 
+function! emmet#lang#haml#moveNextPrevItem(flag)
+  return emmet#lang#haml#moveNextPrev(a:flag)
+endfunction
+
 function! emmet#lang#haml#moveNextPrev(flag)
   let pos = search('""', a:flag ? 'Wb' : 'W')
   if pos != 0
diff --git a/autoload/emmet/lang/html.vim b/autoload/emmet/lang/html.vim
index b19a50a..721121c 100644
--- a/autoload/emmet/lang/html.vim
+++ b/autoload/emmet/lang/html.vim
@@ -644,6 +644,15 @@ function! emmet#lang#html#balanceTag(flag) range
   endif
 endfunction
 
+function! emmet#lang#html#moveNextPrevItem(flag)
+  silent! exe "normal \<esc>"
+  let mx = '\%([0-9a-zA-Z-:]\+\%(="[^"]*"\|=''[^'']*''\|[^ ''">\]]*\)\{0,1}\)'
+  let pos = searchpos('\s'.mx.'\zs', '')
+  if pos != [0,0]
+    call feedkeys('v?\s\zs'.mx."\<cr>", '')
+  endif
+endfunction
+
 function! emmet#lang#html#moveNextPrev(flag)
   let pos = search('\%(</\w\+\)\@<!\zs><\/\|\(""\)\|^\(\s*\)$', a:flag ? 'Wpb' : 'Wp')
   if pos == 3
diff --git a/autoload/emmet/lang/sass.vim b/autoload/emmet/lang/sass.vim
index c93ebfe..e6a657e 100644
--- a/autoload/emmet/lang/sass.vim
+++ b/autoload/emmet/lang/sass.vim
@@ -139,6 +139,10 @@ function! emmet#lang#sass#balanceTag(flag) range
   endif
 endfunction
 
+function! emmet#lang#sass#moveNextPrevItem(flag)
+  return emmet#lang#sass#moveNextPrev(a:flag)
+endfunction
+
 function! emmet#lang#sass#moveNextPrev(flag)
   let pos = search('""\|\(^\s*|\s*\zs\)', a:flag ? 'Wpb' : 'Wp')
   if pos == 2
diff --git a/autoload/emmet/lang/scss.vim b/autoload/emmet/lang/scss.vim
index 58bb7ea..cf984c5 100644
--- a/autoload/emmet/lang/scss.vim
+++ b/autoload/emmet/lang/scss.vim
@@ -108,6 +108,10 @@ function! emmet#lang#scss#balanceTag(flag) range
   endif
 endfunction
 
+function! emmet#lang#scss#moveNextPrevItem(flag)
+  return emmet#lang#scss#moveNextPrev(a:flag)
+endfunction
+
 function! emmet#lang#scss#moveNextPrev(flag)
   call emmet#lang#css#moveNextPrev(a:flag)
 endfunction
diff --git a/autoload/emmet/lang/slim.vim b/autoload/emmet/lang/slim.vim
index 9b6de55..43161b9 100644
--- a/autoload/emmet/lang/slim.vim
+++ b/autoload/emmet/lang/slim.vim
@@ -213,6 +213,10 @@ function! emmet#lang#slim#balanceTag(flag) range
   endif
 endfunction
 
+function! emmet#lang#slim#moveNextPrevItem(flag)
+  return emmet#lang#slim#moveNextPrev(a:flag)
+endfunction
+
 function! emmet#lang#slim#moveNextPrev(flag)
   let pos = search('""\|\(^\s*|\s*\zs\)', a:flag ? 'Wpb' : 'Wp')
   if pos == 2
diff --git a/unittest.vim b/unittest.vim
index 1dafe77..a4b6d22 100644
--- a/unittest.vim
+++ b/unittest.vim
@@ -125,7 +125,7 @@ function! s:test(...)
           call s:show_title(n+1, query)
         else
           call s:show_title(n+1, query)
-          unlet! res | let res = emmet#ExpandWord(query, testgroup.type, 0)
+          unlet! res | let res = emmet#expandWord(query, testgroup.type, 0)
         endif
         for opt in keys(options)
           if has_key(oldoptions, opt)