modifications
merge and modify
merge

Merge branch 'master' of github.com:babebridou/simone