Merge Fixes for Issue #94