add run()
Merge branch 'fix' into HEAD

Conflicts:
	vimrc
test
fix error