Finishes feature for issue #94