ADDED: template for STP and STR
Merge remote-tracking branch 'origin/master'