template tidy
Merge origin/master