Merge pull request #1 from raulmacarie/b1

B1
Add template working
Add template working
First draft
Small changes
Small changes 2
Integration v1
Integration v1
Integration v1
Integration v2
Rebasing