Commit 3

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