Implementing issue #32.