Merge pull request #81 from isflorin/dev

Update vendors
Merge pull request #83 from isflorin/test

Merge pull request #81 from isflorin/dev