Treatments to template
Merge branch 'master' of https://github.com/noblezilla/BDI