Task #57


Change-Id: I3a2fb3d005c60ef4c7aeb44487096c26f45a8e50
Signed-off-by: Martika <martikaschwan@yahoo.de>