fix install
Merge branch 'fix_m'