Update of the original template, see readme file for more details