Merge Fixes for Issue #149