Merge branch feature/installer-script into develop