Handle issue #3 #4

Signed-off-by: Sven Haardiek <Sven@Haardiek.de>