Fixes Component dependencies
Merge branch 'pr/235'
Merge branch 'master' of https://github.com/julianshapiro/velocity