Solves Issue #38

Signed-off-by: Vinzenz Feenstra <vfeenstr@redhat.com>