More of the same

See additions to issue #9 and newly created issue #10 for details.