merging verzak1_branch