Profile conflicts resolved
Changes
Merge pull request #33 from adoulrac/rachid/release1

Rachid/release1