Fixes Variables, 2.12, issue #12

Fixes #12

Signed-off-by: Irina Chichikova <diva.artim@gmail.com>
Fixes Variables, 2.14, issue #13

Fixes #13

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