5.1 reviewed
Changes luis
Merge branch 'master' into corrections