modified
Merge pull request #1 from kiyanwang/switch-to-ejs

modified