Updates related to issue #44.