Merge pull request #8 from dbellettini/master

Vendor update & configuration enhancement