update install and configuration files
Merge branches 'version3' and 'testing123' into version3