Changes to helpers and vendor
Merge pull request #1 from mrfoh/helpers

Changes to helpers and vendor