warnings solved
Merge branch 'jaume'