removed underscore dependency
Merge branch 'templating'