update
update
update config
update installation script
Merge branch 'dev'