Add customs
Merge branch 'master' of github.com:stephaneliu/vi