Changes made by Siyka Marinova (siyka.marinova@gmail.com).
Merge commit '77bd103c4ba1568e43dad321e479e97a28a80ea6'
Changes made by Siyka Marinova (siyka.marinova@gmail.com).