Update from vimperator