Update vendors
Fixed fixtures
Merge pull request #111 from isflorin/dev

Dev