Closes #186 (closed) and #120 (and all related to it)
added 52m of time spent at 2018-12-03
mentioned in commit b33aa46d
merged