template feedback
Merge remote-tracking branch 'hellman/master' into maqueteo