Fixed an issue with erb
Merge branch 'dev'