adding vendor()
Merge origin/master