Update engine to abide by Template.Engine behaviour and bump version