Test for Issue #31
Fix Issue #31.  The test doesn't work, though.
Version bump.
Further expansion of bug fix for issue #31