Bug fix: wrong name for erb.
Merge branch 'master' into DS