Merge Fixes for Issue #92