Commit 2

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