Merge Fixes for Issue #76