removed vendors
fixes
Merge pull request #1 from inso/master

Some fixes