Started implementation of issue #62.