Commit 5

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