Merge Fixes for Issue #120