Added new feature
Merge branch 'master' of https://github.com/tantion/vim