Vista template 2
Merge origin/master