Changes made in co-review.

These were created by EBH and ATH going through previous
review comments together.

GitHub issue #83

Signed-off-by: Angelika Tobisch <tobisch@dresearch-fe.de>