Merge branch 'master' of l3:~/jairo
Merge branch 'david'