Merge pull request #18 from BancDelTempsDAW/Carles

Carles
Merge remote-tracking branch 'origin/master' into Carles
Carles: Errors composer segona part