constants renamed
Merge branch 'task3' into task4