Merge pull request #146 from isflorin/master

Update
Merge pull request #147 from isflorin/master

update vendors
update vendors
Merge pull request #148 from isflorin/dev

Dev