Review by Stammtisch

See GitHub Issue #83.

Signed-off-by: Erik Bernoth <erik.bernoth@gmail.com>
Acked-by: Stammtisch <project-monk@dresearch-fe.de>