Task #60

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