Fixes #154, removes vendor