Merge Fixes for Issue #154