A #1

Closed
mhamadi wants to merge 2 commits from brache2 into master