Some changes
Merge branch 'task_4_y' into d_beta
Merge branch 'd_beta' of https://github.com/romio-sj/test_sjr into d_beta