Merge branch 'hotfix/change_ind_dict'
Updated genotype
Merge branch 'hotfix/change_genotype' into develop