Changed main function
Merge branch 'master' into fill_array_function