Updated
Fixed feature 2
Merge branch 'iss_MX-2' into development_massi

README is now ok
Merge branch 'development_massi'

README is now OK