Added template inheritance
Merge remote-tracking branch 'upstream/master'
Added update action
Merge pull request #2 from lvidarte/master

Template inheritance + Update action