merge of fix_install branch