Merge fix for Issue #20.