change aliases and add template
Merge pull request #2 from jasonchi/20140903

20140903 change aliases and add template