template working
Merge origin/master