Further extensions added from issue #14.