commit 1/3

Signed-off-by: Maarten Zeeman <sailor1991@msn.com>
commit 2/3

Signed-off-by: Maarten Zeeman <sailor1991@msn.com>
Commit 3/3

Signed-off-by: Maarten Zeeman <sailor1991@msn.com>