Finishes the feature in #137. @kej This issue can be closed now.