tanliyuan Merge pull request #172 from tanliyuan/feature/template