Commit 4

Change-Id: I44379a7592b754ec1caaf9952d0da9754c6a8064
Signed-off-by: Christian Siewert <siewert.christian@ymail.com>