minor modifications
Merge branch 'vim'