FIX: rolling back commit 31e41088f7f75872c3602965364bbd97fc3867b3 as it conflicts with fix for issue #233.
FIX: rolling back commit 31e41088f7f75872c3602965364bbd97fc3867b3 as it conflicts with fix for issue #233.

rheber/red,NikolayShubenkovProgSchool/red,rheber/red,vehar/red,red-eco/red,NikolayShubenkovProgSchool/red,red-eco/red,vehar/red,iArnold/red,iArnold/red