fixing tabs to spaces
updating configuration and scripts
mergin