Implementing issue #20.