Closes #20

Signed-off-by: web32 <maximilian.soellner@stf-group.de>