merged changes from branch work_codility