Merge Fixes for Issue #126