unifiying the installed files
save
Merge branch 'EMAx'