Merge Fixes for Issue #119