sync with template repo
Merge pull request #1 from steven-/master

sync with template repo