closes #121 (closed)
assigned to @ldam
requested review from @kienle
merged
mentioned in commit 77c4835d