Added extra decorations
Merge branch 'devel-C' of https://github.com/eloipuertas/ES2014B into devel-C