Commit 8

Signed-off-by: Bartosz Domin <bdomin93@gmail.com>