use ERB template
Merge branch 'use_erb'