merge
Merge branch 'master' of git@github.com:moabdelhadi/dmg-core.git