Merge Fixes for Issue #128