MAJ walid 23/07 1055
Merge branch 'master' of https://github.com/deltabeta/APL