Merge Fixes for Issue #146