Completion of issue #31