A continuation of issues #48 and #54.
A continuation of issues #48 and #54.