Solution for problem 1 and 2

Signed-off-by: Martin Seeler <developer@chasmo.de>