Support for issue #30 in this branch.  Do not use yet.