Fixes Conditions, issue #20

Fixes #20

Signed-off-by: Irina Chichikova <diva.artim@gmail.com>
Fixes Conditions, issue #21

Fixes #21

Signed-off-by: Irina Chichikova <diva.artim@gmail.com>