Implementing issue #14.