Merge pull request #140 from isflorin/dev

Dev
Merge pull request #141 from isflorin/dev

Update
Update vendors
Merge pull request #142 from isflorin/master

asd