Merge branch 'develop'
install script
better filename