Closes #16 (closed)
assigned to @sfunk
requested review from @uveentj
merged
mentioned in commit 0a1091fa