Joining templates
Last fixes and documentation
.