Fixed strange error with return code
Merge branch 'task3' into task4